diff -Nru lx-control-center-0.0.0ubuntu2/debian/changelog lx-control-center-0.0.0ubuntu2/debian/changelog --- lx-control-center-0.0.0ubuntu2/debian/changelog 2018-04-16 15:47:04.000000000 +0000 +++ lx-control-center-0.0.0ubuntu2/debian/changelog 2018-04-17 15:47:01.000000000 +0000 @@ -1,8 +1,8 @@ -lx-control-center (0.0.0ubuntu2-0~201804152201~ubuntu17.10.1) artful; urgency=low +lx-control-center (0.0.0ubuntu2-0~201804161952~ubuntu17.10.1) artful; urgency=low * Auto build. - -- Julien Lavergne Mon, 16 Apr 2018 15:47:04 +0000 + -- Julien Lavergne Tue, 17 Apr 2018 15:47:01 +0000 lx-control-center (0.0.0ubuntu2) UNRELEASED; urgency=medium diff -Nru lx-control-center-0.0.0ubuntu2/debian/git-build-recipe.manifest lx-control-center-0.0.0ubuntu2/debian/git-build-recipe.manifest --- lx-control-center-0.0.0ubuntu2/debian/git-build-recipe.manifest 2018-04-16 15:47:04.000000000 +0000 +++ lx-control-center-0.0.0ubuntu2/debian/git-build-recipe.manifest 2018-04-17 15:47:01.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-0~201804152201 -lp:lx-control-center git-commit:0a03abd6898400f5751f072945bc4642c947672a +# git-build-recipe format 0.4 deb-version {debupstream}-0~201804161952 +lp:lx-control-center git-commit:fb4c839d34fb1354be1f9d96abf021aeff6395b5 diff -Nru lx-control-center-0.0.0ubuntu2/LXControlCenter/modules/test-module/main.py lx-control-center-0.0.0ubuntu2/LXControlCenter/modules/test-module/main.py --- lx-control-center-0.0.0ubuntu2/LXControlCenter/modules/test-module/main.py 2018-04-16 15:47:04.000000000 +0000 +++ lx-control-center-0.0.0ubuntu2/LXControlCenter/modules/test-module/main.py 2018-04-17 15:47:01.000000000 +0000 @@ -46,7 +46,7 @@ pygtk.require('2.0') import gtk # LXCC will attach self.main_box to the main window - self.main_box = gtk.Box() + self.main_box = gtk.VBox() self.test_label = gtk.Label("This is a test label") self.main_box.add(self.test_label) diff -Nru lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtk2.py lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtk2.py --- lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtk2.py 2018-04-16 15:47:04.000000000 +0000 +++ lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtk2.py 2018-04-17 15:47:01.000000000 +0000 @@ -17,10 +17,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. -import gi -gi.require_version('Gtk', '2.0') -from gi.repository import Gtk -from gi.repository.GdkPixbuf import Pixbuf +import pygtk +pygtk.require('2.0') +import gtk as Gtk import logging import os @@ -157,15 +156,18 @@ frame.add(hbox) #Impossible to add a custom structure in liststore ... - liststore = Gtk.ListStore(Pixbuf, str, str) - iconview = Gtk.IconView.new() + #GTK2 Specific + liststore = Gtk.ListStore(Gtk.gdk.Pixbuf, str, str) + iconview = Gtk.IconView() + iconview.set_model(liststore) iconview.set_pixbuf_column(0) iconview.set_text_column(1) #GTK2 Specific => Force width to avoid too much spacing iconview.set_item_width(self.icon_view_icons_size * 4) iconview.set_columns(self.icon_view_columns) - iconview.set_selection_mode(Gtk.SelectionMode.SINGLE) + #GTK2 Specific: Disable single click + #iconview.set_selection_mode(Gtk.SelectionMode.SINGLE) #GTK2 spcific => enable single selection click if (self.mode == "main-UI"): @@ -182,9 +184,9 @@ logging.debug("build_UI: item orientation = %s" % iconview.get_item_orientation()) if (self.icon_force_size == True): - icon_lookup_flags = Gtk.IconLookupFlags.FORCE_SIZE + icon_lookup_flags = Gtk.ICON_LOOKUP_FORCE_SVG else: - icon_lookup_flags = Gtk.IconLookupFlags.GENERIC_FALLBACK + icon_lookup_flags = Gtk.ICON_LOOKUP_USE_BUILTIN self.define_icon_type_with_gtk_theme() @@ -360,8 +362,10 @@ def create_togglebutton(self, label, icon): button = Gtk.Button(label = label) button.set_size_request(200, -1) - icon_pixbuf = self.theme.get_default().load_icon(icon, 24, Gtk.IconLookupFlags.FORCE_SIZE) - icon_image = Gtk.Image.new_from_pixbuf(icon_pixbuf) + # GTK2 Specific + icon_pixbuf = self.theme.load_icon(icon, 24, 0) + icon_image = Gtk.image_new_from_pixbuf(icon_pixbuf) + button.set_image(icon_image) button.set_sensitive(False) return button @@ -390,9 +394,11 @@ self.window_box = Gtk.VBox() # GTK2 Specific: add_with_viewport window_scrolled.add_with_viewport(self.window_box) - window_scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + # GTK2 Specific: Remove set_policy + #window_scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) - self.theme = Gtk.IconTheme.get_default() + # GTK2 Specific + self.theme = Gtk.icon_theme_get_default() self.content_ui_vbox = Gtk.VBox() if (self.standalone_module == None): diff -Nru lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtkcommon.py lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtkcommon.py --- lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtkcommon.py 2018-04-16 15:47:04.000000000 +0000 +++ lx-control-center-0.0.0ubuntu2/LXControlCenter/widgets/gtkcommon.py 2018-04-17 15:47:01.000000000 +0000 @@ -31,9 +31,9 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk else: - import gi - gi.require_version('Gtk', '2.0') - from gi.repository import Gtk + import pygtk + pygtk.require('2.0') + import gtk as Gtk # Grid / Table def create_table_conf(self, spacing=20, margin_top=10, margin_side=30): @@ -102,7 +102,7 @@ def on_spin_button_change(self, widget, setting): logging.debug("Save value: %s" % widget.get_value_as_int()) setting.set(widget.get_value_as_int()) - + def add_combobox_text(self, setting, grid, position): logging.info("gtkcommon.add_combobox: enter function") if len(setting.support_list) > 0 or self.gtk_widgets_debug_mode == True: @@ -113,7 +113,10 @@ for item in setting.available_values: store.append([index, item, setting.available_values[item]]) index = index + 1 - combo = Gtk.ComboBox.new_with_model(store) + if self.toolkit == "GTK3": + combo = Gtk.ComboBox.new_with_model(store) + else: + combo = Gtk.ComboBox(store) renderer_text = Gtk.CellRendererText() combo.pack_start(renderer_text, True) combo.add_attribute(renderer_text, "text", 2) @@ -248,4 +251,4 @@ try: widget.set_alignment(0.5) except: - logging.info("Widget can't be align. Pass") \ No newline at end of file + logging.info("Widget can't be align. Pass") diff -Nru lx-control-center-0.0.0ubuntu2/README.md lx-control-center-0.0.0ubuntu2/README.md --- lx-control-center-0.0.0ubuntu2/README.md 2018-04-16 15:47:04.000000000 +0000 +++ lx-control-center-0.0.0ubuntu2/README.md 2018-04-17 15:47:01.000000000 +0000 @@ -69,13 +69,13 @@ - python2-psutil GTK3 frontend - - python3 + - python2 / python3 - pygi - GLib GIR - GTK3 GIR Qt5 frontend - - python3 + - python2 / python3 - pyqt5 Webkit frontend