aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-06 18:27:00 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-07 00:05:15 -0300
commit6e9819a78f8339428ec155ba15fa342b6aa95c4b (patch)
tree8a524fe5e6486108f8136d4aa80a04bd13ccb92b
parentc4d991848b2d18895ab763f1628289806943551c (diff)
camorama-gtk3: explicitly use the obsoleted GtkImageMenuItem
The Gtk 3 manual says it would be possible to use a GtkBox with a GtkLabel and GtkImage in order to replace it. I tried, both directly and using Glade 3.22. Didn't work. So, let's explicitly revert this change, as it makes Camorama with a bad visual (IMHO). We'll still need some solution if we want to preserve icons on menus for Gtk 4, but that's a separate issue. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--data/camorama-gtk3.ui57
1 files changed, 35 insertions, 22 deletions
diff --git a/data/camorama-gtk3.ui b/data/camorama-gtk3.ui
index 2d88de9..05520e7 100644
--- a/data/camorama-gtk3.ui
+++ b/data/camorama-gtk3.ui
@@ -23,6 +23,18 @@
<property name="upper">255</property>
<property name="step_increment">1</property>
</object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="lower">1</property>
+ <property name="upper">360</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkImage" id="image21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">snap-icon-small.xpm</property>
+ </object>
<object class="GtkWindow" id="main_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -41,20 +53,23 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="menuitem1">
+ <object class="GtkImageMenuItem" id="menuitem1">
+ <property name="label">gtk-file</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
<child type="submenu">
<object class="GtkMenu" id="menuitem1_menu">
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="imagemenuitem1">
+ <object class="GtkImageMenuItem" id="imagemenuitem1">
+ <property name="label" translatable="yes">_Take Picture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Take Picture</property>
<property name="use_underline">True</property>
+ <property name="image">image21</property>
+ <property name="use_stock">False</property>
<accelerator key="t" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
@@ -65,11 +80,12 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="quit">
+ <object class="GtkImageMenuItem" id="quit">
+ <property name="label">gtk-quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Quit</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
</child>
</object>
@@ -77,20 +93,22 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem3">
+ <object class="GtkImageMenuItem" id="menuitem3">
+ <property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
<child type="submenu">
<object class="GtkMenu" id="menuitem3_menu">
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="imagemenuitem3">
+ <object class="GtkImageMenuItem" id="imagemenuitem3">
+ <property name="label">gtk-preferences</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Preferences</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
</child>
</object>
@@ -146,20 +164,22 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem6">
+ <object class="GtkImageMenuItem" id="menuitem6">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
<child type="submenu">
<object class="GtkMenu" id="menuitem6_menu">
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="imagemenuitem4">
+ <object class="GtkImageMenuItem" id="imagemenuitem4">
+ <property name="label">gtk-about</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_About</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
</child>
</object>
@@ -593,18 +613,11 @@
<placeholder/>
</child>
</object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="lower">1</property>
- <property name="upper">360</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkDialog" id="prefswindow">
<property name="can_focus">False</property>
- <property name="title" translatable="yes">Preferences</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
+ <property name="transient_for">main_window</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>

Privacy Policy