Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gtk 3.24: Update Gtk #476

Open
wants to merge 3 commits into
base: ghini-3.1-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 68 additions & 68 deletions bauble/bauble.glade

Large diffs are not rendered by default.

295 changes: 162 additions & 133 deletions bauble/connmgr.glade

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bauble/editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,12 +540,12 @@ def combobox_remove(self, widget, item):
model = widget.get_model()
for i, row in enumerate(model):
if item == row[0]:
widget.remove_text(i)
widget.remove(i)
break
logger.warning("combobox_remove - not found >%s<" % item)
elif isinstance(item, int):
# remove at position
widget.remove_text(item)
widget.remove(item)
else:
logger.warning('invoked combobox_remove with item=(%s)%s' %
(type(item), item))
Expand Down
243 changes: 133 additions & 110 deletions bauble/notes.glade

Large diffs are not rendered by default.

251 changes: 137 additions & 114 deletions bauble/pictures.glade

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions bauble/pictures_view.glade
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.18"/>
<!-- interface-naming-policy project-wide -->
<requires lib="gtk+" version="3.24"/>
<object class="GtkDialog" id="pictures_view_dialog">
<property name="width_request">480</property>
<property name="height_request">480</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="width-request">480</property>
<property name="height-request">480</property>
<property name="can-focus">False</property>
<property name="border-width">5</property>
<property name="title" translatable="yes">Picture Viewer</property>
<property name="type_hint">dialog</property>
<property name="accept_focus">False</property>
<property name="focus_on_map">False</property>
<property name="type-hint">dialog</property>
<property name="accept-focus">False</property>
<property name="focus-on-map">False</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog_vbox1">
<property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
<object class="GtkButton" id="button1">
<property name="label">gtk-close</property>
<property name="use-action-appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="use-stock">True</property>
</object>
<packing>
<property name="expand">False</property>
Expand All @@ -47,19 +47,19 @@
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<property name="shadow_type">none</property>
<property name="can-focus">False</property>
<property name="resize-mode">queue</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkBox" id="pictures_box">
<property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<placeholder/>
Expand Down
Loading