[regexxer] Remove the custom toolbar preferences. We now have the same toolbar style as the system toolbar styl
- From: Fabien Parent <fparent src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [regexxer] Remove the custom toolbar preferences. We now have the same toolbar style as the system toolbar styl
- Date: Mon, 21 Sep 2009 20:31:03 +0000 (UTC)
commit e91a6fc2728512f92bdc75abe63c18ce89febd01
Author: Fabien Parent <parent f gmail com>
Date: Fri Jul 24 21:49:33 2009 +0200
Remove the custom toolbar preferences. We now have the same toolbar style as the system toolbar style.
src/mainwindow.cc | 4 -
src/prefdialog.cc | 51 --------
src/prefdialog.h | 3 -
ui/mainwindow.ui | 1 -
ui/prefdialog.ui | 367 +++++++++++++----------------------------------------
5 files changed, 88 insertions(+), 338 deletions(-)
---
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index cffad20..edbbbfd 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -975,10 +975,6 @@ void MainWindow::on_conf_value_changed(const Glib::ustring& key, const Gnome::Co
textview_ ->modify_font(font);
entry_preview_->modify_font(font);
}
- else if (key.raw() == conf_key_toolbar_style)
- {
- toolbar_->set_toolbar_style(Util::enum_from_nick<Gtk::ToolbarStyle>(value.get_string()));
- }
}
}
diff --git a/src/prefdialog.cc b/src/prefdialog.cc
index 15fe221..6c34959 100644
--- a/src/prefdialog.cc
+++ b/src/prefdialog.cc
@@ -30,34 +30,6 @@
#include <config.h>
-namespace
-{
-
-static
-const Gtk::ToolbarStyle toolbar_style_values[] =
-{
- Gtk::TOOLBAR_ICONS,
- Gtk::TOOLBAR_TEXT,
- Gtk::TOOLBAR_BOTH,
- Gtk::TOOLBAR_BOTH_HORIZ
-};
-
-static
-int get_toolbar_style_index(const Glib::ustring& value)
-{
- const Gtk::ToolbarStyle toolbar_style = Util::enum_from_nick<Gtk::ToolbarStyle>(value);
-
- for (unsigned int i = 0; i < G_N_ELEMENTS(toolbar_style_values); ++i)
- {
- if (toolbar_style_values[i] == toolbar_style)
- return i;
- }
-
- g_return_val_if_reached(-1);
-}
-
-} // anonymous namespace
-
namespace Regexxer
{
@@ -69,7 +41,6 @@ PrefDialog::PrefDialog(Gtk::Window& parent)
button_textview_font_ (0),
button_match_color_ (0),
button_current_color_ (0),
- combo_toolbar_style_ (0),
entry_fallback_ (0),
entry_fallback_changed_ (false)
{
@@ -96,7 +67,6 @@ void PrefDialog::load_xml()
xml->get_widget("button_textview_font", button_textview_font_);
xml->get_widget("button_match_color", button_match_color_);
xml->get_widget("button_current_color", button_current_color_);
- xml->get_widget("combo_toolbar_style", combo_toolbar_style_);
xml->get_widget("entry_fallback", entry_fallback_);
const Glib::RefPtr<SizeGroup> size_group = SizeGroup::create(SIZE_GROUP_VERTICAL);
@@ -127,9 +97,6 @@ void PrefDialog::connect_signals()
button_current_color_->signal_color_set().connect(
sigc::mem_fun(*this, &PrefDialog::on_current_color_set));
- conn_toolbar_style_ = combo_toolbar_style_->signal_changed().connect(
- sigc::mem_fun(*this, &PrefDialog::on_option_toolbar_style_changed));
-
entry_fallback_->signal_changed().connect(
sigc::mem_fun(*this, &PrefDialog::on_entry_fallback_changed));
@@ -170,11 +137,6 @@ void PrefDialog::on_conf_value_changed(const Glib::ustring& key, const Gnome::Co
{
button_current_color_->set_color(Gdk::Color(value.get_string()));
}
- else if (key.raw() == conf_key_toolbar_style)
- {
- Util::ScopedBlock block (conn_toolbar_style_);
- combo_toolbar_style_->set_active(get_toolbar_style_index(value.get_string()));
- }
else if (key.raw() == conf_key_fallback_encoding)
{
entry_fallback_->set_text(value.get_string());
@@ -217,19 +179,6 @@ void PrefDialog::on_current_color_set()
Gnome::Conf::Client::get_default_client()->set(conf_key_current_match_color, value);
}
-void PrefDialog::on_option_toolbar_style_changed()
-{
- const int index = combo_toolbar_style_->get_active_row_number();
-
- if (index >= 0)
- {
- g_return_if_fail(unsigned(index) < G_N_ELEMENTS(toolbar_style_values));
-
- const Glib::ustring value = Util::enum_to_nick(toolbar_style_values[index]);
- Gnome::Conf::Client::get_default_client()->set(conf_key_toolbar_style, value);
- }
-}
-
void PrefDialog::on_entry_fallback_changed()
{
// On dialog close, write back to the GConf database only if the user
diff --git a/src/prefdialog.h b/src/prefdialog.h
index b52d0f5..1d17269 100644
--- a/src/prefdialog.h
+++ b/src/prefdialog.h
@@ -31,7 +31,6 @@ namespace Gtk
{
class CheckButton;
class ColorButton;
-class ComboBox;
class Dialog;
class Entry;
class FontButton;
@@ -58,7 +57,6 @@ private:
Gtk::FontButton* button_textview_font_;
Gtk::ColorButton* button_match_color_;
Gtk::ColorButton* button_current_color_;
- Gtk::ComboBox* combo_toolbar_style_;
Gtk::Entry* entry_fallback_;
Util::AutoConnection conn_toolbar_style_;
bool entry_fallback_changed_;
@@ -74,7 +72,6 @@ private:
void on_textview_font_set();
void on_match_color_set();
void on_current_color_set();
- void on_option_toolbar_style_changed();
void on_entry_fallback_changed();
void on_entry_fallback_activate();
};
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 6bc6545..56d3b0d 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -253,7 +253,6 @@
<child>
<object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
- <property name="toolbar_style">both-horiz</property>
<child>
<object class="GtkToolButton" id="button_save">
<property name="visible">True</property>
diff --git a/ui/prefdialog.ui b/ui/prefdialog.ui
index 50d6d1a..92228ce 100644
--- a/ui/prefdialog.ui
+++ b/ui/prefdialog.ui
@@ -1,8 +1,10 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="model1">
<columns>
+ <!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
<data>
@@ -22,249 +24,123 @@
</object>
<object class="GtkDialog" id="prefdialog">
<property name="title" translatable="yes">Preferences</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="focus_on_map">True</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <object class="GtkButton" id="closebutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
<child>
<object class="GtkTable" id="table_look">
- <property name="border_width">10</property>
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="border_width">10</property>
+ <property name="n_rows">3</property>
<property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">12</property>
<property name="column_spacing">12</property>
+ <property name="row_spacing">12</property>
<child>
<object class="GtkLabel" id="label_textview_font">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Text view font:</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
<property name="mnemonic_widget">button_textview_font</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">expand</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_match_color">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Match color:</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
<property name="mnemonic_widget">button_match_color</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">expand</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_current_color">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">C_urrent match color:</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
<property name="mnemonic_widget">button_current_color</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options">expand</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_toolbar_style">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Tool_bar style:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">combo_toolbar_style</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options">expand</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="button_current_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="use_alpha">False</property>
- <property name="focus_on_click">True</property>
+ <property name="receives_default">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="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="button_match_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="use_alpha">False</property>
- <property name="focus_on_click">True</property>
+ <property name="receives_default">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="y_options"/>
+ <property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkFontButton" id="button_textview_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="show_style">True</property>
- <property name="show_size">True</property>
+ <property name="receives_default">False</property>
<property name="use_font">True</property>
- <property name="use_size">False</property>
- <property name="focus_on_click">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combo_toolbar_style">
- <property name="visible">True</property>
- <property name="model">model1</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
</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">fill</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</object>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
</child>
<child type="tab">
<object class="GtkHBox" id="hbox_look">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image_look">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="icon-size">1</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -272,47 +148,33 @@
<property name="visible">True</property>
<property name="label" translatable="yes">_Look’n’feel</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox_file">
- <property name="border_width">10</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="border_width">10</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label_info">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">regexxer attempts to read a file in the following encodings before giving up:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -320,141 +182,82 @@
<property name="visible">True</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
<property name="column_spacing">3</property>
<child>
<object class="GtkLabel" id="label_3rd">
<property name="visible">True</property>
- <property name="label" translatable="yes">3.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
<property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="label" translatable="yes">3.</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_2nd">
<property name="visible">True</property>
- <property name="label" translatable="yes">2.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
<property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="label" translatable="yes">2.</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_1st">
<property name="visible">True</property>
- <property name="label" translatable="yes">1.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
<property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="label" translatable="yes">1.</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_utf8">
<property name="visible">True</property>
- <property name="label" translatable="yes">UTF-8</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="label" translatable="yes">UTF-8</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="box_fallback">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_fallback">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Fallback _encoding:</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
<property name="mnemonic_widget">entry_fallback</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_fallback">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="has_frame">True</property>
- <property name="activates_default">False</property>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -463,65 +266,50 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_locale">
<property name="visible">True</property>
- <property name="label" translatable="yes">The encoding specified by the current locale</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="label" translatable="yes">The encoding specified by the current locale</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">fill</property>
- <property name="y_options">fill</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkHBox" id="hbox_file">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image_file">
<property name="visible">True</property>
<property name="stock">gtk-properties</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="icon-size">1</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -529,28 +317,49 @@
<property name="visible">True</property>
<property name="label" translatable="yes">_File access</property>
<property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="closebutton1">
+ <property name="label">gtk-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="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
