[postr] Make the postr.glade glade3 compatible
- From: Germán Poó Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [postr] Make the postr.glade glade3 compatible
- Date: Mon, 13 Sep 2010 03:05:51 +0000 (UTC)
commit 1484c42f2e18e241480437899a0de5563c0c9c87
Author: Germán Póo-Caamaño <gpoo gnome org>
Date: Sun Sep 12 19:57:52 2010 -0700
Make the postr.glade glade3 compatible
It also update the minimum gtk+ version required.
src/postr.glade | 124 ++++++++++++++++++++++++------------------------------
1 files changed, 55 insertions(+), 69 deletions(-)
---
diff --git a/src/postr.glade b/src/postr.glade
index c29f42b..fcfa5b7 100644
--- a/src/postr.glade
+++ b/src/postr.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.10 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="window">
<property name="visible">True</property>
<property name="title" translatable="yes">Flickr Uploader</property>
@@ -23,32 +23,33 @@
<widget class="GtkMenu" id="menuitem1_menu">
<child>
<widget class="GtkImageMenuItem" id="add_photos">
- <property name="visible">True</property>
<property name="label" translatable="yes">_Add Photos...</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
+ <property name="use_stock">False</property>
<signal name="activate" handler="on_add_photos_activate"/>
- <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
- <widget class="GtkImage" id="image15">
+ <widget class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
- <property name="icon_size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="remove_menu">
- <property name="visible">True</property>
<property name="label" translatable="yes">_Remove Photos</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
+ <property name="use_stock">False</property>
<signal name="activate" handler="on_remove_activate"/>
- <accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <accelerator key="D" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
- <widget class="GtkImage" id="image16">
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
+ <property name="yalign">0.49000000953674316</property>
<property name="stock">gtk-remove</property>
- <property name="icon_size">1</property>
</widget>
</child>
</widget>
@@ -60,16 +61,16 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="save_session_menu">
- <property name="visible">True</property>
<property name="label" translatable="yes">_Save session</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
+ <property name="use_stock">False</property>
<signal name="activate" handler="on_save_session_activate"/>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <accelerator key="S" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
- <widget class="GtkImage" id="image16">
+ <widget class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
- <property name="icon_size">1</property>
</widget>
</child>
</widget>
@@ -80,7 +81,7 @@
<property name="label" translatable="yes">_Load session</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_load_session_activate"/>
- <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</widget>
</child>
<child>
@@ -89,33 +90,19 @@
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="switchmenu">
+ <widget class="GtkMenuItem" id="switch_menu">
<property name="visible">True</property>
<property name="label" translatable="yes">_Switch user...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_switch_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image5">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="upload_menu">
+ <widget class="GtkMenuItem" id="upload_menu">
<property name="visible">True</property>
<property name="label" translatable="yes">_Upload</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_upload_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image17">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
</widget>
</child>
<child>
@@ -125,8 +112,8 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="quit">
- <property name="visible">True</property>
<property name="label">gtk-quit</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_quit_activate"/>
@@ -146,18 +133,12 @@
<widget class="GtkMenu" id="select2_menu">
<child>
<widget class="GtkImageMenuItem" id="select_all">
+ <property name="label">gtk-select-all</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">_Select All</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_select_all_activate"/>
- <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image18">
- <property name="visible">True</property>
- <property name="stock">gtk-select-all</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
+ <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</widget>
</child>
<child>
@@ -166,7 +147,7 @@
<property name="label" translatable="yes">Dese_lect All</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_deselect_all_activate"/>
- <accelerator key="E" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
+ <accelerator key="E" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
</widget>
</child>
<child>
@@ -175,7 +156,7 @@
<property name="label" translatable="yes">_Invert Selection</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_invert_selection_activate"/>
- <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</widget>
</child>
</widget>
@@ -191,8 +172,8 @@
<widget class="GtkMenu" id="menuitem4_menu">
<child>
<widget class="GtkImageMenuItem" id="about">
+ <property name="label">gtk-about</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">gtk-about</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_about_activate"/>
@@ -206,6 +187,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -225,11 +207,12 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-missing-image</property>
- <property name="icon_size">5</property>
+ <property name="icon-size">5</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -252,7 +235,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="on_upload_activate"/>
<child>
<widget class="GtkHBox" id="hbox2">
@@ -268,6 +250,7 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -287,7 +270,9 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -319,9 +304,9 @@
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="Custom" id="thumbview">
<property name="visible">True</property>
@@ -331,11 +316,13 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkButton" id="add_button">
@@ -344,11 +331,11 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="on_add_photos_activate"/>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -358,7 +345,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
<signal name="clicked" handler="on_remove_activate"/>
</widget>
<packing>
@@ -414,9 +400,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="Custom" id="group_selector">
<property name="visible">True</property>
@@ -459,9 +445,6 @@
<property name="column_spacing">4</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="content_type_label">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -530,12 +513,12 @@
</child>
<child>
<widget class="GtkCheckButton" id="visible_check">
+ <property name="label" translatable="yes">_Visible in search results</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Visible in search results</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
@@ -587,6 +570,9 @@
<property name="bottom_attach">4</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -699,11 +685,11 @@
</child>
<child>
<widget class="GtkButton" id="rename_button">
+ <property name="label" translatable="yes">Rename</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Rename</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<signal name="clicked" handler="on_rename_activate"/>
</widget>
<packing>
@@ -730,16 +716,16 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="desc_view">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="wrap_mode">word</property>
<property name="accepts_tab">False</property>
</widget>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
