diff options
| author | Pablo Barciela <[email protected]> | 2018-04-11 15:17:47 +0200 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2018-04-11 22:39:29 +0200 |
| commit | 55d46b4e87fc9c07f11923af39ef6afc5b114e86 (patch) | |
| tree | ca2bd02bdcf25ec19373be238c3631d28d45fce2 | |
| parent | a518a93b575372faee1a3da6aaa9f20cf2e10ec1 (diff) | |
| download | mate-panel-55d46b4e87fc9c07f11923af39ef6afc5b114e86.tar.bz2 mate-panel-55d46b4e87fc9c07f11923af39ef6afc5b114e86.tar.xz | |
clock.ui: avoid deprecated:
avoid deprecated:
GtkTable
GtkVBox
GtkHBox
GtkVButtonBox
GtkHButtonBox
GtkButton:use-stock
GtkImage:stock
| -rw-r--r-- | applets/clock/clock.ui | 1046 |
1 files changed, 570 insertions, 476 deletions
diff --git a/applets/clock/clock.ui b/applets/clock/clock.ui index bda702ea..822aca0b 100644 --- a/applets/clock/clock.ui +++ b/applets/clock/clock.ui @@ -1,303 +1,55 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.0 --> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> - <object class="GtkDialog" id="edit-location-window"> + <requires lib="gtk+" version="3.22"/> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">59</property> + <property name="value">59</property> + <property name="step_increment">1</property> + <property name="page_increment">30</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">59</property> + <property name="value">59</property> + <property name="step_increment">1</property> + <property name="page_increment">30</property> + </object> + <object class="GtkAdjustment" id="adjustment3"> + <property name="upper">23</property> + <property name="value">23</property> + <property name="step_increment">1</property> + <property name="page_increment">12</property> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">process-stop</property> + </object> + <object class="GtkDialog" id="set-time-window"> + <property name="can_focus">False</property> <property name="border_width">5</property> + <property name="title" translatable="yes">Time & Date</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> + <object class="GtkBox" id="dialog-vbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> - <child> - <object class="GtkTable" id="table26"> - <property name="visible">True</property> - <property name="n_columns">3</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkVBox" id="vbox34"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow12"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <child> - <object class="GtkViewport" id="viewport3"> - <property name="visible">True</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkImage" id="image30"> - <property name="stock">gtk-missing-image</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table27"> - <property name="visible">True</property> - <property name="border_width">5</property> - <property name="n_rows">5</property> - <property name="n_columns">4</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label243"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" comments="Languages that have a single word that translates as either "state" or "province" should use that instead of "region"."><small><i>Type a city, region, or country name and then select a match from the pop-up.</i></small></property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkVBox" id="edit-location-name-box"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="edit-location-timezone-box"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="timezone-label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Timezone:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="location-name-label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Location Name:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edit-location-latitude-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="edit-location-latitude-combo"> - <property name="visible">True</property> - <property name="model">liststore2</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label240"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><i>(optional)</i></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label239"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><i>(optional)</i></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="edit-location-longitude-combo"> - <property name="visible">True</property> - <property name="model">liststore1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edit-location-longitude-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label238"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">L_ongitude:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edit-location-longitude-entry</property> - </object> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox35"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkLabel" id="label237"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">L_atitude:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edit-location-latitude-entry</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="right_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area3"> + <object class="GtkButtonBox" id="dialog-action_area2"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="edit-location-cancel-button"> - <property name="label">gtk-cancel</property> + <object class="GtkButton" id="cancel-set-time-button"> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="image">image1</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -306,13 +58,12 @@ </packing> </child> <child> - <object class="GtkButton" id="edit-location-ok-button"> - <property name="label">gtk-ok</property> + <object class="GtkButton" id="set-time-button"> + <property name="label" translatable="yes">_Set System Time</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -323,38 +74,24 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">edit-location-cancel-button</action-widget> - <action-widget response="-5">edit-location-ok-button</action-widget> - </action-widgets> - </object> - <object class="GtkDialog" id="set-time-window"> - <property name="border_width">5</property> - <property name="title" translatable="yes">Time & Date</property> - <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> - <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="yscale">0</property> <property name="top_padding">7</property> <property name="bottom_padding">6</property> <property name="left_padding">7</property> <property name="right_padding">7</property> <child> - <object class="GtkHBox" id="time_settings_box"> + <object class="GtkBox" id="time_settings_box"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkCalendar" id="calendar"> @@ -365,24 +102,27 @@ <property name="day">3</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkTable" id="table1"> + <object class="GtkGrid" id="table1"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> + <property name="can_focus">False</property> + <property name="valign">start</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkHBox" id="hbox61"> + <object class="GtkBox" id="hbox61"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkSpinButton" id="hours_spin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="adjustment">adjustment3</property> <property name="climb_rate">1</property> <property name="numeric">True</property> @@ -398,7 +138,7 @@ <object class="GtkSpinButton" id="minutes_spin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="adjustment">adjustment2</property> <property name="climb_rate">1</property> <property name="numeric">True</property> @@ -414,7 +154,7 @@ <object class="GtkSpinButton" id="seconds_spin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="invisible_char">●</property> <property name="adjustment">adjustment1</property> <property name="climb_rate">1</property> <property name="numeric">True</property> @@ -429,48 +169,45 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> </packing> </child> <child> <object class="GtkLabel" id="current_time_label"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label">23:59:59</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label236"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Time:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">hours_spin</property> + <property name="xalign">0</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> <object class="GtkLabel" id="label235"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Current Time:</property> + <property name="xalign">0</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -489,18 +226,77 @@ <property name="position">1</property> </packing> </child> + </object> + </child> + <action-widgets> + <action-widget response="0">cancel-set-time-button</action-widget> + <action-widget response="0">set-time-button</action-widget> + </action-widgets> + <child> + <placeholder/> + </child> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-ok</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">process-stop</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">help-browser</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">window-close</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add</property> + </object> + <object class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-edit</property> + </object> + <object class="GtkImage" id="image8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-remove</property> + </object> + <object class="GtkDialog" id="prefs-window"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Clock Preferences</property> + <property name="resizable">False</property> + <property name="window_position">center</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="visible">True</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_area2"> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkButton" id="cancel-set-time-button"> - <property name="label">gtk-cancel</property> + <object class="GtkButton" id="prefs-help-button"> + <property name="label" translatable="yes">_Help</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="image">image4</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -509,10 +305,11 @@ </packing> </child> <child> - <object class="GtkButton" id="set-time-button"> - <property name="label" translatable="yes">_Set System Time</property> + <object class="GtkButton" id="time-settings-button"> + <property name="label" translatable="yes">Time _Settings</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> </object> @@ -522,80 +319,55 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="prefs-close-button"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="image">image5</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> - </object> - </child> - <action-widgets> - <action-widget response="0">cancel-set-time-button</action-widget> - <action-widget response="0">set-time-button</action-widget> - </action-widgets> - </object> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">East</col> - </row> - <row> - <col id="0" translatable="yes">West</col> - </row> - </data> - </object> - <object class="GtkListStore" id="liststore2"> - <columns> - <!-- column-name item --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">North</col> - </row> - <row> - <col id="0" translatable="yes">South</col> - </row> - </data> - </object> - <object class="GtkDialog" id="prefs-window"> - <property name="border_width">5</property> - <property name="title" translatable="yes">Clock Preferences</property> - <property name="resizable">False</property> - <property name="window_position">center</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">2</property> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">5</property> <child> - <object class="GtkVBox" id="vbox17"> + <object class="GtkBox" id="vbox17"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="clock-options"> + <object class="GtkBox" id="clock-options"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label210"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Clock Format</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -609,10 +381,12 @@ <child> <object class="GtkAlignment" id="alignment32"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox49"> + <object class="GtkBox" id="hbox49"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">13</property> <child> <object class="GtkRadioButton" id="12hr_radio"> @@ -649,25 +423,30 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox29"> + <object class="GtkBox" id="vbox29"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label229"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Panel Display</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -681,10 +460,12 @@ <child> <object class="GtkAlignment" id="alignment33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox30"> + <object class="GtkBox" id="vbox30"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -731,7 +512,7 @@ <property name="fill">False</property> <property name="position">2</property> </packing> - </child> + </child> <child> <object class="GtkCheckButton" id="weather_check"> <property name="label" translatable="yes">Show _weather</property> @@ -766,11 +547,15 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -779,6 +564,7 @@ <child type="tab"> <object class="GtkLabel" id="label209"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">General</property> </object> <packing> @@ -786,14 +572,16 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox24"> + <object class="GtkBox" id="vbox24"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkHBox" id="hbox54"> + <object class="GtkBox" id="hbox54"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow10"> @@ -808,27 +596,34 @@ <property name="can_focus">True</property> <property name="headers_visible">False</property> <property name="hover_expand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> </object> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVButtonBox" id="vbuttonbox2"> + <object class="GtkButtonBox" id="vbuttonbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <property name="layout_style">start</property> <child> <object class="GtkButton" id="prefs-locations-add-button"> - <property name="label">gtk-add</property> + <property name="label" translatable="yes">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="image">image6</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -838,12 +633,13 @@ </child> <child> <object class="GtkButton" id="prefs-locations-edit-button"> - <property name="label">gtk-edit</property> + <property name="label" translatable="yes">_Edit</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="image">image7</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -853,12 +649,13 @@ </child> <child> <object class="GtkButton" id="prefs-locations-remove-button"> - <property name="label">gtk-remove</property> + <property name="label" translatable="yes">_Remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="image">image8</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -875,6 +672,8 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -886,6 +685,7 @@ <child type="tab"> <object class="GtkLabel" id="label220"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Locations</property> </object> <packing> @@ -894,21 +694,24 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox27"> + <object class="GtkBox" id="vbox27"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="vbox28"> + <object class="GtkBox" id="vbox28"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label224"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Display</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -922,124 +725,120 @@ <child> <object class="GtkAlignment" id="alignment34"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table25"> + <object class="GtkGrid" id="table25"> <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> + <property name="can_focus">False</property> <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkComboBox" id="visibility_combo"/> + <object class="GtkComboBox" id="visibility_combo"> + <property name="can_focus">False</property> + </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkLabel" id="label232"> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Visibility unit:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">visibility_combo</property> + <property name="xalign">0</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> - <object class="GtkComboBox" id="pressure_combo"/> + <object class="GtkComboBox" id="pressure_combo"> + <property name="can_focus">False</property> + </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkLabel" id="label231"> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Pressure unit:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pressure_combo</property> + <property name="xalign">0</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> <object class="GtkComboBox" id="wind_speed_combo"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkComboBox" id="temperature_combo"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label228"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Wind speed unit:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">wind_speed_combo</property> + <property name="xalign">0</property> </object> <packing> + <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> <object class="GtkLabel" id="label227"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Temperature unit:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">temperature_combo</property> + <property name="xalign">0</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1051,6 +850,7 @@ <child type="tab"> <object class="GtkLabel" id="label223"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Weather</property> </object> <packing> @@ -1060,20 +860,73 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> + </object> + </child> + <action-widgets> + <action-widget response="-11">prefs-help-button</action-widget> + <action-widget response="0">time-settings-button</action-widget> + <action-widget response="-7">prefs-close-button</action-widget> + </action-widgets> + <child> + <placeholder/> + </child> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">East</col> + </row> + <row> + <col id="0" translatable="yes">West</col> + </row> + </data> + </object> + <object class="GtkListStore" id="liststore2"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">North</col> + </row> + <row> + <col id="0" translatable="yes">South</col> + </row> + </data> + </object> + <object class="GtkDialog" id="edit-location-window"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="resizable">False</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area3"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkButton" id="prefs-help-button"> - <property name="label">gtk-help</property> + <object class="GtkButton" id="edit-location-cancel-button"> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="image">image3</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -1082,12 +935,13 @@ </packing> </child> <child> - <object class="GtkButton" id="time-settings-button"> - <property name="label" translatable="yes">Time _Settings</property> + <object class="GtkButton" id="edit-location-ok-button"> + <property name="label" translatable="yes">_OK</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="image">image2</property> <property name="use_underline">True</property> </object> <packing> @@ -1096,53 +950,293 @@ <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="table26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <object class="GtkButton" id="prefs-close-button"> - <property name="label">gtk-close</property> + <object class="GtkBox" id="vbox34"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow12"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <child> + <object class="GtkViewport" id="viewport3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkImage" id="image30"> + <property name="can_focus">False</property> + <property name="icon_name">image-missing</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="table27"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="label243"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="label" translatable="yes" comments="Languages that have a single word that translates as either "state" or "province" should use that instead of "region"."><small><i>Type a city, region, or country name and then select a match from the pop-up.</i></small></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="edit-location-name-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="edit-location-timezone-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="timezone-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Timezone:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="location-name-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Location Name:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edit-location-latitude-entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="invisible_char">•</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="edit-location-latitude-combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore2</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label240"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="label" translatable="yes"><i>(optional)</i></property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label239"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="label" translatable="yes"><i>(optional)</i></property> + <property name="use_markup">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="edit-location-longitude-combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="edit-location-longitude-entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="invisible_char">•</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label238"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">L_ongitude:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">edit-location-longitude-entry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkBox" id="vbox35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label237"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">L_atitude:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">edit-location-latitude-entry</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> </child> <action-widgets> - <action-widget response="-11">prefs-help-button</action-widget> - <action-widget response="0">time-settings-button</action-widget> - <action-widget response="-7">prefs-close-button</action-widget> + <action-widget response="-6">edit-location-cancel-button</action-widget> + <action-widget response="-5">edit-location-ok-button</action-widget> </action-widgets> - </object> - <object class="GtkAdjustment" id="adjustment1"> - <property name="value">59</property> - <property name="upper">59</property> - <property name="step_increment">1</property> - <property name="page_increment">30</property> - </object> - <object class="GtkAdjustment" id="adjustment2"> - <property name="value">59</property> - <property name="upper">59</property> - <property name="step_increment">1</property> - <property name="page_increment">30</property> - </object> - <object class="GtkAdjustment" id="adjustment3"> - <property name="value">23</property> - <property name="upper">23</property> - <property name="step_increment">1</property> - <property name="page_increment">12</property> + <child> + <placeholder/> + </child> </object> </interface> |