Here's how I'd define Migration Selection Types:
+With Regexes:
+Client -- Migrate data from selected client only. Migration Selection
+Pattern regexp provides pattern to select client names, eg ^FS00* makes
+all client names starting with FS00 eligible for migration.
+
+Jobname -- Migration all jobs matching name. Migration Selection Pattern
+regexp provides pattern to select jobnames existing in pool.
+
+Volume -- Migrate all data on specified volumes. Migration Selection
+Pattern regexp provides selection criteria for volumes to be migrated.
+Volumes must exist in pool to be eligible for migration.
+
+
+With Regex optional:
LowestUtil -- Identify the volume in the pool with the least data on it
and empty it. No Migration Selection Pattern required.
<lowmig>. Pool highmig and lowmig values are in pool definition, no
Migration Selection Pattern required.
-Client -- Migrate data from selected client only. Migration Selection
-Pattern regexp provides pattern to select client names, eg ^FS00* makes
-all client names starting with FS00 eligible for migration.
+
+No regex:
+SQLQuery -- Migrate all jobuids returned by the supplied SQL query.
+Migration Selection Pattern contains SQL query to execute; should return
+a list of 1 or more jobuids to migrate.
PoolResidence -- Migrate data sitting in pool for longer than
PoolResidence value in pool definition. Migration Selection Pattern
optional; if specified, override value in pool definition (value in
minutes).
-Volume -- Migrate all data on specified volumes. Migration Selection
-Pattern regexp provides selection criteria for volumes to be migrated.
-Volumes must exist in pool to be eligible for migration.
-
-Jobname -- Migration all jobs matching name. Migration Selection Pattern
-regexp provides pattern to select jobnames existing in pool.
-
-SQLQuery -- Migrate all jobuids returned by the supplied SQL query.
-Migration Selection Pattern contains SQL query to execute; should return
-a list of 1 or more jobuids to migrate.
[ possibly a Python event -- kes ]
===
Kern Sibbald
General:
+23Apr06
+- Add 'Dir Status' button to the gnome console.
+- More work on migration.
+- Restore non-compatible base64 coding to permit compatibility.
+- Display heap stats in Storage daemon without debug level.
22Apr06
- Integrate most of the MinGW changes -- more to do.
21Apr06
+wxconsole.console_apps
+wxconsole.desktop.consolehelper
+wxconsole.desktop.xsu
disk-changer
bacula-tray-monitor.desktop
bacula-tray-monior.desktop
<property name="default_height">600</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<signal name="delete_event" handler="on_console_delete_event" last_modification_time="Tue, 16 Mar 2004 12:30:54 GMT"/>
<child>
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
<property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
<property name="tooltips">True</property>
+ <property name="show_arrow">True</property>
<child>
- <widget class="button" id="connect_button1">
+ <widget class="GtkToolButton" id="connect_button1">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Connect to Director</property>
<property name="label" translatable="yes">Connect</property>
<property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-new</property>
+ <property name="stock_id">gtk-disconnect</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_connect_button_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <widget class="button" id="run_button1">
+ <widget class="GtkToolButton" id="run_button1">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Run a Job</property>
<property name="label" translatable="yes">Run</property>
<property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-execute</property>
+ <property name="stock_id">gtk-execute</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_run_button_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <widget class="button" id="msgs_button">
+ <widget class="GtkToolButton" id="dir_button">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Display Messages</property>
- <property name="label" translatable="yes">Msgs</property>
+ <property name="label" translatable="yes">Dir Status</property>
<property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-find</property>
- <signal name="clicked" handler="on_msgs_button_clicked"/>
+ <property name="stock_id">gnome-stock-text-bulleted-list</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_dir_button_clicked" last_modification_time="Sun, 23 Apr 2006 07:52:39 GMT"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <widget class="button" id="restore_button">
+ <widget class="GtkToolButton" id="restore_button">
<property name="visible">True</property>
<property name="label" translatable="yes">Restore</property>
<property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-revert-to-saved</property>
+ <property name="stock_id">gtk-revert-to-saved</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_restore_button_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <widget class="button" id="label_button">
+ <widget class="GtkToolButton" id="label_button">
<property name="visible">True</property>
<property name="label" translatable="yes">Label</property>
<property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-save-as</property>
+ <property name="stock_id">gtk-save-as</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_label_button_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="msgs_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Display Messages</property>
+ <property name="label" translatable="yes">Msgs</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-find</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_msgs_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
</widget>
</child>
<widget class="GtkTextView" id="text1">
<property name="visible">True</property>
<property name="editable">False</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">True</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">150</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<signal name="key_press_event" handler="on_entry1_key_press_event"/>
<signal name="key_release_event" handler="on_entry1_key_release_event"/>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="modal">True</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_about_button_clicked"/>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.1</property>
+ <property name="xalign">0.10000000149</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.0400001</property>
+ <property name="xalign">0.0400000996888</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.15</property>
+ <property name="xalign">0.15000000596</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="modal">True</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_select_director_OK_clicked"/>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_select_director_cancel_clicked"/>
</widget>
<packing>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.48</property>
- <property name="yalign">0.46</property>
+ <property name="xalign">0.479999989271</property>
+ <property name="yalign">0.460000008345</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_run_ok_clicked"/>
</widget>
</child>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_run_cancel_clicked"/>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">9</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">2</property>
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox28">
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<signal name="changed" handler="on_entry_job_changed"/>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">30</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">123</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">100</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">120</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">120</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">120</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">120</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">120</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">36</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="default_height">450</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<signal name="delete_event" handler="on_restore_files_delete_event" last_modification_time="Tue, 16 Mar 2004 11:41:52 GMT"/>
<child>
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
<property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
<property name="tooltips">True</property>
+ <property name="show_arrow">True</property>
<child>
- <widget class="button" id="restore_up_button">
+ <widget class="GtkToolButton" id="restore_up_button">
<property name="visible">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
+ <property name="stock_id">gtk-go-up</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_restore_up_button_clicked" last_modification_time="Tue, 16 Mar 2004 11:44:40 GMT"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <widget class="button" id="restore_add_button">
+ <widget class="GtkToolButton" id="restore_add_button">
<property name="visible">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
+ <property name="stock_id">gtk-add</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_restore_add_button_clicked" last_modification_time="Tue, 16 Mar 2004 11:44:49 GMT"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <widget class="button" id="restore_remove_button">
+ <widget class="GtkToolButton" id="restore_remove_button">
<property name="visible">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
+ <property name="stock_id">gtk-remove</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
<signal name="clicked" handler="on_restore_remove_button_clicked" last_modification_time="Tue, 16 Mar 2004 11:45:02 GMT"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.02</property>
+ <property name="xalign">0.019999999553</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_restore_select_ok_clicked" last_modification_time="Tue, 16 Mar 2004 11:52:07 GMT"/>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_restore_select_cancel_clicked" last_modification_time="Tue, 16 Mar 2004 11:52:22 GMT"/>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">8</property>
<property name="modal">True</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_label_ok_clicked"/>
</widget>
</child>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_label_cancel_clicked"/>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">9</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.15</property>
+ <property name="xalign">0.15000000596</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.12</property>
+ <property name="xalign">0.119999997318</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.17</property>
+ <property name="xalign">0.170000001788</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.09</property>
+ <property name="xalign">0.0900000035763</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="default_height">200</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<property name="label">gtk-help</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">-11</property>
</widget>
</child>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_select_files_button_clicked" last_modification_time="Wed, 17 Mar 2004 18:15:26 GMT"/>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox49">
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_restore_cancel_clicked" last_modification_time="Wed, 17 Mar 2004 18:17:10 GMT"/>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">9</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">2</property>
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox50">
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<signal name="changed" handler="on_restore_job_entry_changed" last_modification_time="Wed, 17 Mar 2004 18:21:48 GMT"/>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">27</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">25</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">23</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">21</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">21</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">53</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<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>
<property name="response_id">-7</property>
</widget>
</child>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="visible">True</property>
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
- <property name="pulse_step">0.1</property>
+ <property name="pulse_step">0.10000000149</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
static char OKbootstrap[] = "3000 OK bootstrap\n";
static bool get_job_to_migrate(JCR *jcr);
+struct jobitems;
+static bool regex_find_jobids(JCR *jcr, jobitems *ji, const char *query1,
+ const char *query2, const char *type);
/*
* Called here before the job is run to do the job
return false;
}
+struct jobitems {
+ POOLMEM *JobIds;
+ uint32_t count;
+};
+
/*
* Callback handler make list of JobIds
*/
static int jobid_handler(void *ctx, int num_fields, char **row)
{
- POOLMEM *JobIds = (POOLMEM *)ctx;
+ jobitems *ji = (jobitems *)ctx;
- if (JobIds[0] != 0) {
- pm_strcat(JobIds, ",");
+ if (ji->count == 0) {
+ ji->JobIds[0] = 0;
+ } else {
+ pm_strcat(ji->JobIds, ",");
}
- pm_strcat(JobIds, row[0]);
+ pm_strcat(ji->JobIds, row[0]);
+ ji->count++;
return 0;
}
return 0;
}
+/* Get Job names in Pool */
+const char *sql_job =
+ "SELECT DISTINCT Job.Name from Job,Pool"
+ " WHERE Pool.Name='%s' AND Job.PoolId=Pool.PoolId";
+
+/* Get JobIds from regex'ed Job names */
+const char *sql_jobids_from_job =
+ "SELECT DISTINCT Job.JobId FROM Job,Pool"
+ " WHERE Job.Name='%s' AND Pool.Name='%s' AND Job.PoolId=Pool.PoolId"
+ " ORDER by Job.StartTime";
+
+/* Get Client names in Pool */
+const char *sql_client =
+ "SELECT DISTINCT Client.Name from Client,Pool,Job"
+ " WHERE Pool.Name='%s' AND Job.ClientId=Client.ClientId AND"
+ " Job.PoolId=Pool.PoolId";
+
+/* Get JobIds from regex'ed Client names */
+const char *sql_jobids_from_client =
+ "SELECT DISTINCT Job.JobId FROM Job,Pool"
+ " WHERE Client.Name='%s' AND Pool.Name='%s' AND Job.PoolId=Pool.PoolId"
+ " AND Job.ClientId=Client.ClientId "
+ " ORDER by Job.StartTime";
+
+/* Get Volume names in Pool */
+const char *sql_vol =
+ "SELECT DISTINCT VolumeName FROM Media,Pool WHERE"
+ " VolStatus in ('Full','Used','Error') AND"
+ " Media.PoolId=Pool.PoolId AND Pool.Name='%s'";
+
+/* Get JobIds from regex'ed Volume names */
+const char *sql_jobids_from_vol =
+ "SELECT DISTINCT Job.JobId FROM Media,JobMedia,Job"
+ " WHERE Media.VolumeName='%s' AND Media.MediaId=JobMedia.MediaId"
+ " AND JobMedia.JobId=Job.JobId"
+ " ORDER by Job.StartTime";
+
+
+
+
+
const char *sql_smallest_vol =
"SELECT MediaId FROM Media,Pool WHERE"
" VolStatus in ('Full','Used','Error') AND"
" Media.PoolId=Pool.PoolId AND Pool.Name='%s' AND"
" VolBytes<%s ORDER BY LastWritten ASC LIMIT 1";
-const char *sql_client =
- "SELECT DISTINCT Client.Name from Client,Pool,Media,Job,JobMedia "
- " WHERE Media.PoolId=Pool.PoolId AND Pool.Name='%s' AND"
- " JobMedia.JobId=Job.JobId AND Job.ClientId=Client.ClientId AND"
- " Job.PoolId=Media.PoolId";
-
-const char *sql_job =
- "SELECT DISTINCT Job.Name from Job,Pool"
- " WHERE Pool.Name='%s' AND Job.PoolId=Pool.PoolId";
-
-const char *sql_jobids_from_job =
- "SELECT DISTINCT Job.JobId FROM Job,Pool"
- " WHERE Job.Name='%s' AND Pool.Name='%s' AND Job.PoolId=Pool.PoolId"
- " ORDER by Job.StartTime";
-
const char *sql_ujobid =
"SELECT DISTINCT Job.Job from Client,Pool,Media,Job,JobMedia "
" WHERE Media.PoolId=Pool.PoolId AND Pool.Name='%s' AND"
" JobMedia.JobId=Job.JobId AND Job.PoolId=Media.PoolId";
-const char *sql_vol =
- "SELECT DISTINCT VolumeName FROM Media,Pool WHERE"
- " VolStatus in ('Full','Used','Error') AND"
- " Media.PoolId=Pool.PoolId AND Pool.Name='%s'";
/*
{
char ed1[30];
POOL_MEM query(PM_MESSAGE);
- POOLMEM *JobIds = get_pool_memory(PM_MESSAGE);
JobId_t JobId;
- int stat, rc;
+ int stat;
char *p;
- dlist *item_chain;
- uitem *item = NULL;
- uitem *last_item = NULL;
- char prbuf[500];
- regex_t preg;
+ jobitems ji;
+
+ ji.JobIds = get_pool_memory(PM_MESSAGE);
- JobIds[0] = 0;
+ ji.count = 0;
if (jcr->MigrateJobId != 0) {
jcr->previous_jr.JobId = jcr->MigrateJobId;
Dmsg1(000, "previous jobid=%u\n", jcr->MigrateJobId);
} else {
switch (jcr->job->selection_type) {
case MT_JOB:
- if (!jcr->job->selection_pattern) {
- Jmsg(jcr, M_FATAL, 0, _("No Migration Job selection pattern specified.\n"));
+ if (!regex_find_jobids(jcr, &ji, sql_job, sql_jobids_from_job, "Job")) {
goto bail_out;
- }
- Dmsg1(000, "Job regex=%s\n", jcr->job->selection_pattern);
- /* Complie regex expression */
- rc = regcomp(&preg, jcr->job->selection_pattern, REG_EXTENDED);
- if (rc != 0) {
- regerror(rc, &preg, prbuf, sizeof(prbuf));
- Jmsg(jcr, M_FATAL, 0, _("Could not compile regex pattern \"%s\" ERR=%s\n"),
- jcr->job->selection_pattern, prbuf);
+ }
+ break;
+ case MT_CLIENT:
+ if (!regex_find_jobids(jcr, &ji, sql_client,
+ sql_jobids_from_client, "Client")) {
goto bail_out;
- }
- item_chain = New(dlist(item, &item->link));
- /* Basic query for Job names */
- Mmsg(query, sql_job, jcr->pool->hdr.name);
- Dmsg1(000, "query=%s\n", query.c_str());
- if (!db_sql_query(jcr->db, query.c_str(), unique_name_handler,
- (void *)item_chain)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Job failed. ERR=%s\n"), db_strerror(jcr->db));
+ }
+ break;
+ case MT_VOLUME:
+ if (!regex_find_jobids(jcr, &ji, sql_vol,
+ sql_jobids_from_vol, "Volume")) {
goto bail_out;
- }
- /* Now apply the regex to the job names and remove any item not matched */
- foreach_dlist(item, item_chain) {
- const int nmatch = 30;
- regmatch_t pmatch[nmatch];
- if (last_item) {
- Dmsg1(000, "Remove item %s\n", last_item->item);
- free(last_item->item);
- item_chain->remove(last_item);
- }
- Dmsg1(000, "Jobitem=%s\n", item->item);
- rc = regexec(&preg, item->item, nmatch, pmatch, 0);
- if (rc == 0) {
- last_item = NULL; /* keep this one */
- } else {
- last_item = item;
- }
- }
- if (last_item) {
- free(last_item->item);
- Dmsg1(000, "Remove item %s\n", last_item->item);
- item_chain->remove(last_item);
- }
- regfree(&preg);
- /*
- * At this point, we have a list of items in item_chain
- * that have been matched by the regex, so now we need
- * to look up their jobids.
- */
- JobIds[0] = 0;
- foreach_dlist(item, item_chain) {
- Dmsg1(000, "Got Job: %s\n", item->item);
- Mmsg(query, sql_jobids_from_job, item->item, jcr->pool->hdr.name);
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- }
- if (JobIds[0] == 0) {
- Jmsg(jcr, M_INFO, 0, _("No jobs found to migrate.\n"));
- goto ok_out;
- }
- Dmsg1(000, "Job Jobids=%s\n", JobIds);
- delete item_chain;
+ }
break;
- case MT_SMALLEST_VOL:
- Mmsg(query, sql_smallest_vol, jcr->pool->hdr.name);
- JobIds[0] = 0;
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Volume failed. ERR=%s\n"), db_strerror(jcr->db));
+ case MT_SQLQUERY:
+ if (!jcr->job->selection_pattern) {
+ Jmsg(jcr, M_FATAL, 0, _("No Migration SQL selection pattern specified.\n"));
goto bail_out;
}
- if (JobIds[0] == 0) {
- Jmsg(jcr, M_INFO, 0, _("No Volumes found to migrate.\n"));
- goto ok_out;
- }
- /* ***FIXME*** must loop over JobIds */
- Mmsg(query, sql_jobids_from_mediaid, JobIds);
- JobIds[0] = 0;
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
+ Dmsg1(000, "SQL=%s\n", jcr->job->selection_pattern);
+ if (!db_sql_query(jcr->db, jcr->job->selection_pattern,
+ jobid_handler, (void *)&ji)) {
Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Volume failed. ERR=%s\n"), db_strerror(jcr->db));
+ _("SQL failed. ERR=%s\n"), db_strerror(jcr->db));
goto bail_out;
}
- Dmsg1(000, "Smallest Vol Jobids=%s\n", JobIds);
+ break;
+
+
+/***** Below not implemented yet *********/
+ case MT_SMALLEST_VOL:
+ Mmsg(query, sql_smallest_vol, jcr->pool->hdr.name);
+// Mmsg(query2, sql_jobids_from_mediaid, JobIds);
+// Dmsg1(000, "Smallest Vol Jobids=%s\n", JobIds);
break;
case MT_OLDEST_VOL:
Mmsg(query, sql_oldest_vol, jcr->pool->hdr.name);
- JobIds[0] = 0;
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Volume failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- if (JobIds[0] == 0) {
- Jmsg(jcr, M_INFO, 0, _("No Volume found to migrate.\n"));
- goto ok_out;
- }
- Mmsg(query, sql_jobids_from_mediaid, JobIds);
- JobIds[0] = 0;
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Volume failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- Dmsg1(000, "Oldest Vol Jobids=%s\n", JobIds);
+// Mmsg(query2, sql_jobids_from_mediaid, JobIds);
+// Dmsg1(000, "Oldest Vol Jobids=%s\n", JobIds);
break;
case MT_POOL_OCCUPANCY:
Mmsg(query, sql_pool_bytes, jcr->pool->hdr.name);
- JobIds[0] = 0;
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Volume failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- if (JobIds[0] == 0) {
- Jmsg(jcr, M_INFO, 0, _("No jobs found to migrate.\n"));
- goto ok_out;
- }
- Dmsg1(000, "Pool Occupancy Jobids=%s\n", JobIds);
+// Dmsg1(000, "Pool Occupancy Jobids=%s\n", JobIds);
break;
case MT_POOL_TIME:
Dmsg0(000, "Pool time not implemented\n");
break;
- case MT_CLIENT:
- if (!jcr->job->selection_pattern) {
- Jmsg(jcr, M_FATAL, 0, _("No Migration Client selection pattern specified.\n"));
- goto bail_out;
- }
- Dmsg1(000, "Client regex=%s\n", jcr->job->selection_pattern);
- rc = regcomp(&preg, jcr->job->selection_pattern, REG_EXTENDED);
- if (rc != 0) {
- regerror(rc, &preg, prbuf, sizeof(prbuf));
- Jmsg(jcr, M_FATAL, 0, _("Could not compile regex pattern \"%s\" ERR=%s\n"),
- jcr->job->selection_pattern, prbuf);
- }
- item_chain = New(dlist(item, &item->link));
- Mmsg(query, sql_client, jcr->pool->hdr.name);
- Dmsg1(100, "query=%s\n", query.c_str());
- if (!db_sql_query(jcr->db, query.c_str(), unique_name_handler,
- (void *)item_chain)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Client failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- /* Now apply the regex and create the jobs */
- foreach_dlist(item, item_chain) {
- const int nmatch = 30;
- regmatch_t pmatch[nmatch];
- rc = regexec(&preg, item->item, nmatch, pmatch, 0);
- if (rc == 0) {
- Dmsg1(000, "Do Client=%s\n", item->item);
- }
- free(item->item);
- }
- regfree(&preg);
- delete item_chain;
- break;
- case MT_VOLUME:
- if (!jcr->job->selection_pattern) {
- Jmsg(jcr, M_FATAL, 0, _("No Migration Volume selection pattern specified.\n"));
- goto bail_out;
- }
- Dmsg1(000, "Volume regex=%s\n", jcr->job->selection_pattern);
- rc = regcomp(&preg, jcr->job->selection_pattern, REG_EXTENDED);
- if (rc != 0) {
- regerror(rc, &preg, prbuf, sizeof(prbuf));
- Jmsg(jcr, M_FATAL, 0, _("Could not compile regex pattern \"%s\" ERR=%s\n"),
- jcr->job->selection_pattern, prbuf);
- }
- item_chain = New(dlist(item, &item->link));
- Mmsg(query, sql_vol, jcr->pool->hdr.name);
- Dmsg1(100, "query=%s\n", query.c_str());
- if (!db_sql_query(jcr->db, query.c_str(), unique_name_handler,
- (void *)item_chain)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Job failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- /* Now apply the regex and create the jobs */
- foreach_dlist(item, item_chain) {
- const int nmatch = 30;
- regmatch_t pmatch[nmatch];
- rc = regexec(&preg, item->item, nmatch, pmatch, 0);
- if (rc == 0) {
- Dmsg1(000, "Do Vol=%s\n", item->item);
- }
- free(item->item);
- }
- regfree(&preg);
- delete item_chain;
- break;
- case MT_SQLQUERY:
- JobIds[0] = 0;
- if (!jcr->job->selection_pattern) {
- Jmsg(jcr, M_FATAL, 0, _("No Migration SQL selection pattern specified.\n"));
- goto bail_out;
- }
- Dmsg1(000, "SQL=%s\n", jcr->job->selection_pattern);
- if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)JobIds)) {
- Jmsg(jcr, M_FATAL, 0,
- _("SQL to get Volume failed. ERR=%s\n"), db_strerror(jcr->db));
- goto bail_out;
- }
- if (JobIds[0] == 0) {
- Jmsg(jcr, M_INFO, 0, _("No jobs found to migrate.\n"));
- goto ok_out;
- }
- Dmsg1(000, "Jobids=%s\n", JobIds);
- goto bail_out;
- break;
default:
Jmsg(jcr, M_FATAL, 0, _("Unknown Migration Selection Type.\n"));
goto bail_out;
}
}
- p = JobIds;
+ p = ji.JobIds;
JobId = 0;
stat = get_next_jobid_from_list(&p, &JobId);
Dmsg2(000, "get_next_jobid stat=%d JobId=%u\n", stat, JobId);
jcr->previous_jr.JobId, jcr->previous_jr.Job);
ok_out:
- free_pool_memory(JobIds);
+ free_pool_memory(ji.JobIds);
return true;
bail_out:
- free_pool_memory(JobIds);
+ free_pool_memory(ji.JobIds);
return false;
}
+static bool regex_find_jobids(JCR *jcr, jobitems *ji, const char *query1,
+ const char *query2, const char *type) {
+ dlist *item_chain;
+ uitem *item = NULL;
+ uitem *last_item = NULL;
+ regex_t preg;
+ char prbuf[500];
+ int rc;
+ bool ok = false;
+ POOL_MEM query(PM_MESSAGE);
+
+ item_chain = New(dlist(item, &item->link));
+ if (!jcr->job->selection_pattern) {
+ Jmsg(jcr, M_FATAL, 0, _("No Migration %s selection pattern specified.\n"),
+ type);
+ goto bail_out;
+ }
+ Dmsg1(000, "regex=%s\n", jcr->job->selection_pattern);
+ /* Compile regex expression */
+ rc = regcomp(&preg, jcr->job->selection_pattern, REG_EXTENDED);
+ if (rc != 0) {
+ regerror(rc, &preg, prbuf, sizeof(prbuf));
+ Jmsg(jcr, M_FATAL, 0, _("Could not compile regex pattern \"%s\" ERR=%s\n"),
+ jcr->job->selection_pattern, prbuf);
+ goto bail_out;
+ }
+ /* Basic query for names */
+ Mmsg(query, query1, jcr->pool->hdr.name);
+ if (!db_sql_query(jcr->db, query.c_str(), unique_name_handler,
+ (void *)item_chain)) {
+ Jmsg(jcr, M_FATAL, 0,
+ _("SQL to get %s failed. ERR=%s\n"), type, db_strerror(jcr->db));
+ goto bail_out;
+ }
+ /* Now apply the regex to the names and remove any item not matched */
+ foreach_dlist(item, item_chain) {
+ const int nmatch = 30;
+ regmatch_t pmatch[nmatch];
+ if (last_item) {
+ Dmsg1(000, "Remove item %s\n", last_item->item);
+ free(last_item->item);
+ item_chain->remove(last_item);
+ }
+ Dmsg1(000, "Jobitem=%s\n", item->item);
+ rc = regexec(&preg, item->item, nmatch, pmatch, 0);
+ if (rc == 0) {
+ last_item = NULL; /* keep this one */
+ } else {
+ last_item = item;
+ }
+ }
+ if (last_item) {
+ free(last_item->item);
+ Dmsg1(000, "Remove item %s\n", last_item->item);
+ item_chain->remove(last_item);
+ }
+ regfree(&preg);
+ /*
+ * At this point, we have a list of items in item_chain
+ * that have been matched by the regex, so now we need
+ * to look up their jobids.
+ */
+ ji->count = 0;
+ foreach_dlist(item, item_chain) {
+ Dmsg1(000, "Got Job: %s\n", item->item);
+ Mmsg(query, query2, item->item, jcr->pool->hdr.name);
+ if (!db_sql_query(jcr->db, query.c_str(), jobid_handler, (void *)&ji)) {
+ Jmsg(jcr, M_FATAL, 0,
+ _("SQL failed. ERR=%s\n"), db_strerror(jcr->db));
+ goto bail_out;
+ }
+ }
+ if (ji->count == 0) {
+ Jmsg(jcr, M_INFO, 0, _("No %ss found to migrate.\n"), type);
+ ok = true;
+ }
+bail_out:
+ Dmsg1(000, "Job Jobids=%s\n", ji->JobIds);
+ delete item_chain;
+ return ok;
+}
+
+
/*
* Release resources allocated during backup.
*/
/* Set defaults that correspond to new job selection */
set_restore_dialog_defaults();
}
+
+void
+on_dir_button_clicked(GtkToolButton *toolbutton, gpointer user_data)
+{
+ write_director("status dir");
+}
void
on_restore_cancel_clicked (GtkButton *button,
gpointer user_data);
+
+void
+on_dir_button_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
static GnomeUIInfo file1_menu_uiinfo[] =
{
{
- GNOME_APP_UI_ITEM, _("_Connect"),
- _("Connect to Director"),
+ GNOME_APP_UI_ITEM, N_("_Connect"),
+ N_("Connect to Director"),
(gpointer) on_connect_activate, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
- GNOME_APP_UI_ITEM, _("_Disconnect"),
- _("Disconnect from Director"),
+ GNOME_APP_UI_ITEM, N_("_Disconnect"),
+ N_("Disconnect from Director"),
(gpointer) on_disconnect_activate, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
static GnomeUIInfo item1_menu_uiinfo[] =
{
{
- GNOME_APP_UI_ITEM, _("_Display Messages"),
+ GNOME_APP_UI_ITEM, N_("_Display Messages"),
NULL,
(gpointer) on_msgs_activate, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
static GnomeUIInfo menubar1_uiinfo[] =
{
{
- GNOME_APP_UI_SUBTREE, _("_File"),
+ GNOME_APP_UI_SUBTREE, N_("_File"),
NULL,
file1_menu_uiinfo, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
- GNOME_APP_UI_SUBTREE,_("_Edit"),
+ GNOME_APP_UI_SUBTREE, N_("_Edit"),
NULL,
edit1_menu_uiinfo, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
- GNOME_APP_UI_SUBTREE, _("_View"),
- _("Display Messages"),
+ GNOME_APP_UI_SUBTREE, N_("_View"),
+ N_("Display Messages"),
item1_menu_uiinfo, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
- GNOME_APP_UI_SUBTREE, _("_Settings"),
+ GNOME_APP_UI_SUBTREE, N_("_Settings"),
NULL,
settings1_menu_uiinfo, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, (GdkModifierType) 0, NULL
},
{
- GNOME_APP_UI_SUBTREE, _("_Help"),
+ GNOME_APP_UI_SUBTREE, N_("_Help"),
NULL,
help1_menu_uiinfo, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
GtkWidget *menubar1;
GtkWidget *handlebox2;
GtkWidget *toolbar2;
- GtkWidget *tmp_toolbar_icon;
+ GtkIconSize tmp_toolbar_icon_size;
+ GtkWidget *tmp_image;
GtkWidget *connect_button1;
GtkWidget *run_button1;
- GtkWidget *msgs_button;
+ GtkWidget *dir_button;
GtkWidget *restore_button;
GtkWidget *label_button;
+ GtkWidget *msgs_button;
GtkWidget *vbox7;
GtkWidget *scroll1;
GtkWidget *text1;
GtkWidget *label39;
GtkWidget *frame2;
GtkWidget *status1;
+ GtkAccelGroup *accel_group;
GtkTooltips *tooltips;
tooltips = gtk_tooltips_new ();
+ accel_group = gtk_accel_group_new ();
+
console = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (console), _("Bacula Console"));
gtk_window_set_position (GTK_WINDOW (console), GTK_WIN_POS_CENTER);
gtk_widget_show (menubar1);
gtk_container_add (GTK_CONTAINER (handlebox1), menubar1);
gnome_app_fill_menu (GTK_MENU_SHELL (menubar1), menubar1_uiinfo,
- NULL, FALSE, 0);
+ accel_group, FALSE, 0);
handlebox2 = gtk_handle_box_new ();
gtk_widget_show (handlebox2);
gtk_container_add (GTK_CONTAINER (handlebox2), toolbar2);
gtk_container_set_border_width (GTK_CONTAINER (toolbar2), 1);
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar2), GTK_TOOLBAR_BOTH);
+ tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2));
- tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-new", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2)));
- connect_button1 = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar2),
- GTK_TOOLBAR_CHILD_BUTTON,
- NULL,
- _("Connect"),
- _("Connect to Director"), NULL,
- tmp_toolbar_icon, NULL, NULL);
- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar2)->children)->data))->label), TRUE);
+ tmp_image = gtk_image_new_from_stock ("gtk-disconnect", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ connect_button1 = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Connect"));
gtk_widget_show (connect_button1);
+ gtk_container_add (GTK_CONTAINER (toolbar2), connect_button1);
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (connect_button1), tooltips, _("Connect to Director"), NULL);
- tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-execute", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2)));
- run_button1 = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar2),
- GTK_TOOLBAR_CHILD_BUTTON,
- NULL,
- _("Run"),
- _("Run a Job"), NULL,
- tmp_toolbar_icon, NULL, NULL);
- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar2)->children)->data))->label), TRUE);
+ tmp_image = gtk_image_new_from_stock ("gtk-execute", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ run_button1 = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Run"));
gtk_widget_show (run_button1);
-
- tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-find", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2)));
- msgs_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar2),
- GTK_TOOLBAR_CHILD_BUTTON,
- NULL,
- _("Msgs"),
- _("Display Messages"), NULL,
- tmp_toolbar_icon, NULL, NULL);
- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar2)->children)->data))->label), TRUE);
- gtk_widget_show (msgs_button);
-
- tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-revert-to-saved", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2)));
- restore_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar2),
- GTK_TOOLBAR_CHILD_BUTTON,
- NULL,
- _("Restore"),
- NULL, NULL,
- tmp_toolbar_icon, NULL, NULL);
- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar2)->children)->data))->label), TRUE);
+ gtk_container_add (GTK_CONTAINER (toolbar2), run_button1);
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (run_button1), tooltips, _("Run a Job"), NULL);
+
+ tmp_image = gtk_image_new_from_stock ("gnome-stock-text-bulleted-list", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ dir_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Dir Status"));
+ gtk_widget_show (dir_button);
+ gtk_container_add (GTK_CONTAINER (toolbar2), dir_button);
+
+ tmp_image = gtk_image_new_from_stock ("gtk-revert-to-saved", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ restore_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Restore"));
gtk_widget_show (restore_button);
+ gtk_container_add (GTK_CONTAINER (toolbar2), restore_button);
- tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-save-as", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar2)));
- label_button = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar2),
- GTK_TOOLBAR_CHILD_BUTTON,
- NULL,
- _("Label"),
- NULL, NULL,
- tmp_toolbar_icon, NULL, NULL);
- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar2)->children)->data))->label), TRUE);
+ tmp_image = gtk_image_new_from_stock ("gtk-save-as", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ label_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Label"));
gtk_widget_show (label_button);
+ gtk_container_add (GTK_CONTAINER (toolbar2), label_button);
+
+ tmp_image = gtk_image_new_from_stock ("gtk-find", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ msgs_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Msgs"));
+ gtk_widget_show (msgs_button);
+ gtk_container_add (GTK_CONTAINER (toolbar2), msgs_button);
+ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (msgs_button), tooltips, _("Display Messages"), NULL);
vbox7 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox7);
label38 = gtk_label_new (_(" Command: "));
gtk_widget_show (label38);
gtk_box_pack_start (GTK_BOX (hbox18), label38, FALSE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER);
entry1 = gtk_entry_new ();
gtk_widget_show (entry1);
label39 = gtk_label_new (_(" Status: "));
gtk_widget_show (label39);
gtk_container_add (GTK_CONTAINER (frame1), label39);
+ gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER);
frame2 = gtk_frame_new (NULL);
gtk_widget_show (frame2);
status1 = gtk_label_new (_(" "));
gtk_widget_show (status1);
gtk_container_add (GTK_CONTAINER (frame2), status1);
- gtk_label_set_justify (GTK_LABEL (status1), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (status1), 0, 0.5);
g_signal_connect ((gpointer) console, "delete_event",
- G_CALLBACK (on_console_delete_event),
- NULL);
+ G_CALLBACK (on_console_delete_event),
+ NULL);
g_signal_connect ((gpointer) connect_button1, "clicked",
- G_CALLBACK (on_connect_button_clicked),
- NULL);
+ G_CALLBACK (on_connect_button_clicked),
+ NULL);
g_signal_connect ((gpointer) run_button1, "clicked",
- G_CALLBACK (on_run_button_clicked),
- NULL);
- g_signal_connect ((gpointer) msgs_button, "clicked",
- G_CALLBACK (on_msgs_button_clicked),
- NULL);
+ G_CALLBACK (on_run_button_clicked),
+ NULL);
+ g_signal_connect ((gpointer) dir_button, "clicked",
+ G_CALLBACK (on_dir_button_clicked),
+ NULL);
g_signal_connect ((gpointer) restore_button, "clicked",
- G_CALLBACK (on_restore_button_clicked),
- NULL);
+ G_CALLBACK (on_restore_button_clicked),
+ NULL);
g_signal_connect ((gpointer) label_button, "clicked",
- G_CALLBACK (on_label_button_clicked),
- NULL);
+ G_CALLBACK (on_label_button_clicked),
+ NULL);
+ g_signal_connect ((gpointer) msgs_button, "clicked",
+ G_CALLBACK (on_msgs_button_clicked),
+ NULL);
g_signal_connect ((gpointer) entry1, "key_press_event",
- G_CALLBACK (on_entry1_key_press_event),
- NULL);
+ G_CALLBACK (on_entry1_key_press_event),
+ NULL);
g_signal_connect ((gpointer) entry1, "key_release_event",
- G_CALLBACK (on_entry1_key_release_event),
- NULL);
+ G_CALLBACK (on_entry1_key_release_event),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (console, console, "console");
GLADE_HOOKUP_OBJECT (console, toolbar2, "toolbar2");
GLADE_HOOKUP_OBJECT (console, connect_button1, "connect_button1");
GLADE_HOOKUP_OBJECT (console, run_button1, "run_button1");
- GLADE_HOOKUP_OBJECT (console, msgs_button, "msgs_button");
+ GLADE_HOOKUP_OBJECT (console, dir_button, "dir_button");
GLADE_HOOKUP_OBJECT (console, restore_button, "restore_button");
GLADE_HOOKUP_OBJECT (console, label_button, "label_button");
+ GLADE_HOOKUP_OBJECT (console, msgs_button, "msgs_button");
GLADE_HOOKUP_OBJECT (console, vbox7, "vbox7");
GLADE_HOOKUP_OBJECT (console, scroll1, "scroll1");
GLADE_HOOKUP_OBJECT (console, text1, "text1");
gtk_widget_grab_focus (entry1);
gtk_widget_grab_default (entry1);
+ gtk_window_add_accel_group (GTK_WINDOW (console), accel_group);
+
return console;
}
about1 = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (about1), _("About Bacula Console"));
gtk_window_set_modal (GTK_WINDOW (about1), TRUE);
+ gtk_window_set_type_hint (GTK_WINDOW (about1), GDK_WINDOW_TYPE_HINT_DIALOG);
dialog_vbox5 = GTK_DIALOG (about1)->vbox;
gtk_widget_show (dialog_vbox5);
about_head = gtk_label_new (_("Bacula Console\n"));
gtk_widget_show (about_head);
gtk_box_pack_start (GTK_BOX (vbox9), about_head, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (about_head), GTK_JUSTIFY_CENTER);
hseparator1 = gtk_hseparator_new ();
gtk_widget_show (hseparator1);
copyright = gtk_label_new (_("Copyright (c) 2000 - 2004, Kern Sibbald and John Walker"));
gtk_widget_show (copyright);
gtk_box_pack_start (GTK_BOX (vbox9), copyright, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (copyright), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (copyright), 0.1, 0.5);
authors = gtk_label_new (_("Authors: Kern Sibbald and John Walker"));
gtk_widget_show (authors);
gtk_box_pack_start (GTK_BOX (vbox9), authors, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (authors), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (authors), 0.0400001, 0.5);
theme = gtk_label_new (_("It comes by night and sucks the essence from your computers"));
gtk_widget_show (theme);
gtk_box_pack_start (GTK_BOX (vbox9), theme, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (theme), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (theme), 0.15, 0.5);
dialog_action_area5 = GTK_DIALOG (about1)->action_area;
label44 = gtk_label_new ("");
gtk_widget_show (label44);
gtk_box_pack_start (GTK_BOX (hbox20), label44, TRUE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_CENTER);
about_button = gtk_button_new_from_stock ("gtk-ok");
gtk_widget_show (about_button);
GTK_WIDGET_SET_FLAGS (about_button, GTK_CAN_DEFAULT);
g_signal_connect ((gpointer) about_button, "clicked",
- G_CALLBACK (on_about_button_clicked),
- NULL);
+ G_CALLBACK (on_about_button_clicked),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (about1, about1, "about1");
SelectDirectorDialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (SelectDirectorDialog), _("Select Director"));
gtk_window_set_modal (GTK_WINDOW (SelectDirectorDialog), TRUE);
+ gtk_window_set_type_hint (GTK_WINDOW (SelectDirectorDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
dialog_vbox6 = GTK_DIALOG (SelectDirectorDialog)->vbox;
gtk_widget_show (dialog_vbox6);
label48 = gtk_label_new ("");
gtk_widget_show (label48);
gtk_box_pack_start (GTK_BOX (vbox10), label48, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label48), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label48), 0.48, 0.46);
label47 = gtk_label_new (_("Select Director"));
gtk_widget_show (label47);
gtk_box_pack_start (GTK_BOX (vbox10), label47, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_CENTER);
combo1 = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo1)->popwin),
- "GladeParentKey", combo1);
+ "GladeParentKey", combo1);
gtk_widget_show (combo1);
gtk_box_pack_start (GTK_BOX (vbox10), combo1, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (combo1), 6);
gtk_widget_show (button11);
gtk_box_pack_start (GTK_BOX (hbox21), button11, FALSE, FALSE, 0);
- label46 = gtk_label_new (" ");
+ label46 = gtk_label_new (_(" "));
gtk_widget_show (label46);
gtk_box_pack_start (GTK_BOX (hbox21), label46, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label46), GTK_JUSTIFY_CENTER);
gtk_misc_set_padding (GTK_MISC (label46), 2, 0);
button13 = gtk_button_new_from_stock ("gtk-cancel");
gtk_box_pack_start (GTK_BOX (hbox21), button13, FALSE, FALSE, 0);
g_signal_connect ((gpointer) button11, "clicked",
- G_CALLBACK (on_select_director_OK_clicked),
- NULL);
+ G_CALLBACK (on_select_director_OK_clicked),
+ NULL);
g_signal_connect ((gpointer) button13, "clicked",
- G_CALLBACK (on_select_director_cancel_clicked),
- NULL);
+ G_CALLBACK (on_select_director_cancel_clicked),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (SelectDirectorDialog, SelectDirectorDialog, "SelectDirectorDialog");
RunDialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (RunDialog), _("Run a Job"));
+ gtk_window_set_type_hint (GTK_WINDOW (RunDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
dialog_vbox7 = GTK_DIALOG (RunDialog)->vbox;
gtk_widget_show (dialog_vbox7);
label62 = gtk_label_new (_("Run a Job"));
gtk_widget_show (label62);
gtk_box_pack_start (GTK_BOX (vbox12), label62, FALSE, FALSE, 2);
+ gtk_label_set_justify (GTK_LABEL (label62), GTK_JUSTIFY_CENTER);
gtk_misc_set_padding (GTK_MISC (label62), 0, 9);
alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
combo_job = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_job)->popwin),
- "GladeParentKey", combo_job);
+ "GladeParentKey", combo_job);
gtk_widget_show (combo_job);
gtk_box_pack_start (GTK_BOX (hbox29), combo_job, TRUE, TRUE, 1);
gtk_combo_set_value_in_list (GTK_COMBO (combo_job), TRUE, FALSE);
label64 = gtk_label_new (_(" Type:"));
gtk_widget_show (label64);
gtk_box_pack_start (GTK_BOX (hbox29), label64, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label64), GTK_JUSTIFY_CENTER);
combo_type = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_type)->popwin),
- "GladeParentKey", combo_type);
+ "GladeParentKey", combo_type);
gtk_widget_show (combo_type);
gtk_box_pack_start (GTK_BOX (hbox29), combo_type, FALSE, FALSE, 0);
gtk_widget_set_size_request (combo_type, 141, 24);
gtk_widget_show (entry_type);
gtk_editable_set_editable (GTK_EDITABLE (entry_type), FALSE);
- label114 = gtk_label_new (" ");
+ label114 = gtk_label_new (_(" "));
gtk_widget_show (label114);
gtk_box_pack_start (GTK_BOX (hbox28), label114, FALSE, FALSE, 30);
- gtk_label_set_justify (GTK_LABEL (label114), GTK_JUSTIFY_LEFT);
hbox30 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox30);
combo_client = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_client)->popwin),
- "GladeParentKey", combo_client);
+ "GladeParentKey", combo_client);
gtk_widget_show (combo_client);
gtk_box_pack_start (GTK_BOX (hbox30), combo_client, TRUE, TRUE, 1);
gtk_combo_set_value_in_list (GTK_COMBO (combo_client), TRUE, FALSE);
gtk_widget_show (entry_client);
gtk_editable_set_editable (GTK_EDITABLE (entry_client), FALSE);
- label67 = gtk_label_new (" ");
+ label67 = gtk_label_new (_(" "));
gtk_widget_show (label67);
gtk_box_pack_start (GTK_BOX (hbox30), label67, FALSE, FALSE, 123);
+ gtk_label_set_justify (GTK_LABEL (label67), GTK_JUSTIFY_CENTER);
hbox31 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox31);
combo_fileset = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_fileset)->popwin),
- "GladeParentKey", combo_fileset);
+ "GladeParentKey", combo_fileset);
gtk_widget_show (combo_fileset);
gtk_box_pack_start (GTK_BOX (hbox31), combo_fileset, FALSE, FALSE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_fileset), TRUE, FALSE);
gtk_widget_show (label156);
gtk_box_pack_start (GTK_BOX (hbox31), label156, FALSE, FALSE, 0);
gtk_widget_set_size_request (label156, 13, 16);
- gtk_label_set_justify (GTK_LABEL (label156), GTK_JUSTIFY_LEFT);
label155 = gtk_label_new (_("Priority:"));
gtk_widget_show (label155);
gtk_box_pack_start (GTK_BOX (hbox31), label155, FALSE, FALSE, 0);
gtk_widget_set_size_request (label155, 52, 16);
- gtk_label_set_justify (GTK_LABEL (label155), GTK_JUSTIFY_LEFT);
spinbutton1_adj = gtk_adjustment_new (10, 0, 100, 1, 10, 10);
spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0);
gtk_widget_show (label157);
gtk_box_pack_start (GTK_BOX (hbox31), label157, FALSE, FALSE, 0);
gtk_widget_set_size_request (label157, 100, 16);
- gtk_label_set_justify (GTK_LABEL (label157), GTK_JUSTIFY_LEFT);
hbox32 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox32);
combo_level = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_level)->popwin),
- "GladeParentKey", combo_level);
+ "GladeParentKey", combo_level);
gtk_widget_show (combo_level);
gtk_box_pack_start (GTK_BOX (hbox32), combo_level, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_level), TRUE, FALSE);
gtk_widget_show (entry_level);
gtk_editable_set_editable (GTK_EDITABLE (entry_level), FALSE);
- label71 = gtk_label_new (" ");
+ label71 = gtk_label_new (_(" "));
gtk_widget_show (label71);
gtk_box_pack_start (GTK_BOX (hbox32), label71, FALSE, FALSE, 100);
+ gtk_label_set_justify (GTK_LABEL (label71), GTK_JUSTIFY_CENTER);
hbox33 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox33);
gtk_widget_show (label72);
gtk_box_pack_start (GTK_BOX (hbox33), label72, FALSE, FALSE, 0);
gtk_widget_set_size_request (label72, 68, 16);
+ gtk_label_set_justify (GTK_LABEL (label72), GTK_JUSTIFY_CENTER);
combo_pool = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_pool)->popwin),
- "GladeParentKey", combo_pool);
+ "GladeParentKey", combo_pool);
gtk_widget_show (combo_pool);
gtk_box_pack_start (GTK_BOX (hbox33), combo_pool, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_pool), TRUE, FALSE);
gtk_widget_show (entry_pool);
gtk_editable_set_editable (GTK_EDITABLE (entry_pool), FALSE);
- label73 = gtk_label_new (" ");
+ label73 = gtk_label_new (_(" "));
gtk_widget_show (label73);
gtk_box_pack_start (GTK_BOX (hbox33), label73, FALSE, FALSE, 120);
+ gtk_label_set_justify (GTK_LABEL (label73), GTK_JUSTIFY_CENTER);
hbox39 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox39);
gtk_widget_show (label96);
gtk_box_pack_start (GTK_BOX (hbox39), label96, FALSE, FALSE, 0);
gtk_widget_set_size_request (label96, 68, 16);
+ gtk_label_set_justify (GTK_LABEL (label96), GTK_JUSTIFY_CENTER);
combo_storage = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_storage)->popwin),
- "GladeParentKey", combo_storage);
+ "GladeParentKey", combo_storage);
gtk_widget_show (combo_storage);
gtk_box_pack_start (GTK_BOX (hbox39), combo_storage, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_storage), TRUE, FALSE);
gtk_widget_show (entry_storage);
gtk_editable_set_editable (GTK_EDITABLE (entry_storage), FALSE);
- label97 = gtk_label_new (" ");
+ label97 = gtk_label_new (_(" "));
gtk_widget_show (label97);
gtk_box_pack_start (GTK_BOX (hbox39), label97, FALSE, FALSE, 120);
+ gtk_label_set_justify (GTK_LABEL (label97), GTK_JUSTIFY_CENTER);
hbox40 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox40);
gtk_widget_show (label98);
gtk_box_pack_start (GTK_BOX (hbox40), label98, FALSE, FALSE, 0);
gtk_widget_set_size_request (label98, 68, 16);
+ gtk_label_set_justify (GTK_LABEL (label98), GTK_JUSTIFY_CENTER);
combo_messages = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_messages)->popwin),
- "GladeParentKey", combo_messages);
+ "GladeParentKey", combo_messages);
gtk_widget_show (combo_messages);
gtk_box_pack_start (GTK_BOX (hbox40), combo_messages, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_messages), TRUE, FALSE);
gtk_widget_show (entry_messages);
gtk_editable_set_editable (GTK_EDITABLE (entry_messages), FALSE);
- label99 = gtk_label_new (" ");
+ label99 = gtk_label_new (_(" "));
gtk_widget_show (label99);
gtk_box_pack_start (GTK_BOX (hbox40), label99, FALSE, FALSE, 120);
+ gtk_label_set_justify (GTK_LABEL (label99), GTK_JUSTIFY_CENTER);
hbox34 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox34);
gtk_widget_show (label77);
gtk_box_pack_start (GTK_BOX (hbox34), label77, FALSE, FALSE, 0);
gtk_widget_set_size_request (label77, 68, 16);
+ gtk_label_set_justify (GTK_LABEL (label77), GTK_JUSTIFY_CENTER);
entry_where = gtk_entry_new ();
gtk_widget_show (entry_where);
gtk_box_pack_start (GTK_BOX (hbox34), entry_where, TRUE, TRUE, 0);
- label78 = gtk_label_new (" ");
+ label78 = gtk_label_new (_(" "));
gtk_widget_show (label78);
gtk_box_pack_start (GTK_BOX (hbox34), label78, FALSE, FALSE, 120);
+ gtk_label_set_justify (GTK_LABEL (label78), GTK_JUSTIFY_CENTER);
hbox41 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox41);
gtk_widget_show (label100);
gtk_box_pack_start (GTK_BOX (hbox41), label100, FALSE, FALSE, 0);
gtk_widget_set_size_request (label100, 68, 16);
+ gtk_label_set_justify (GTK_LABEL (label100), GTK_JUSTIFY_CENTER);
entry_when = gtk_entry_new ();
gtk_widget_show (entry_when);
gtk_box_pack_start (GTK_BOX (hbox41), entry_when, TRUE, TRUE, 0);
- label101 = gtk_label_new (" ");
+ label101 = gtk_label_new (_(" "));
gtk_widget_show (label101);
gtk_box_pack_start (GTK_BOX (hbox41), label101, FALSE, FALSE, 120);
+ gtk_label_set_justify (GTK_LABEL (label101), GTK_JUSTIFY_CENTER);
hbox60 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox60);
gtk_widget_show (label153);
gtk_box_pack_start (GTK_BOX (hbox60), label153, FALSE, FALSE, 0);
gtk_widget_set_size_request (label153, 68, 16);
+ gtk_label_set_justify (GTK_LABEL (label153), GTK_JUSTIFY_CENTER);
entry28 = gtk_entry_new ();
gtk_widget_show (entry28);
gtk_box_pack_start (GTK_BOX (hbox60), entry28, TRUE, TRUE, 0);
- label154 = gtk_label_new (" ");
+ label154 = gtk_label_new (_(" "));
gtk_widget_show (label154);
gtk_box_pack_start (GTK_BOX (hbox60), label154, FALSE, FALSE, 36);
+ gtk_label_set_justify (GTK_LABEL (label154), GTK_JUSTIFY_CENTER);
- label84 = gtk_label_new (" ");
+ label84 = gtk_label_new (_(" "));
gtk_widget_show (label84);
gtk_box_pack_start (GTK_BOX (vbox11), label84, FALSE, FALSE, 0);
gtk_widget_set_size_request (label84, 12, 19);
+ gtk_label_set_justify (GTK_LABEL (label84), GTK_JUSTIFY_CENTER);
dialog_action_area6 = GTK_DIALOG (RunDialog)->action_area;
gtk_widget_show (dialog_action_area6);
GTK_WIDGET_SET_FLAGS (run_cancel, GTK_CAN_DEFAULT);
g_signal_connect ((gpointer) entry_job, "changed",
- G_CALLBACK (on_entry_job_changed),
- NULL);
+ G_CALLBACK (on_entry_job_changed),
+ NULL);
g_signal_connect ((gpointer) run_ok, "clicked",
- G_CALLBACK (on_run_ok_clicked),
- NULL);
+ G_CALLBACK (on_run_ok_clicked),
+ NULL);
g_signal_connect ((gpointer) run_cancel, "clicked",
- G_CALLBACK (on_run_cancel_clicked),
- NULL);
+ G_CALLBACK (on_run_cancel_clicked),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (RunDialog, RunDialog, "RunDialog");
static GnomeUIInfo file2_menu_uiinfo[] =
{
- GNOMEUIINFO_MENU_NEW_ITEM (_("_New"), NULL, on_new1_activate, NULL),
+ GNOMEUIINFO_MENU_NEW_ITEM (N_("_New"), NULL, on_new1_activate, NULL),
GNOMEUIINFO_MENU_OPEN_ITEM (on_open1_activate, NULL),
GNOMEUIINFO_MENU_SAVE_ITEM (on_save1_activate, NULL),
GNOMEUIINFO_MENU_SAVE_AS_ITEM (on_save_as1_activate, NULL),
GtkWidget *menubar2;
GtkWidget *handlebox3;
GtkWidget *toolbar3;
+ GtkIconSize tmp_toolbar_icon_size;
GtkWidget *restore_up_button;
GtkWidget *restore_add_button;
GtkWidget *restore_remove_button;
GtkWidget *label152;
GtkWidget *restore_select_cancel;
GtkWidget *label1001;
+ GtkAccelGroup *accel_group;
+
+ accel_group = gtk_accel_group_new ();
restore_file_selection = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_size_request (restore_file_selection, 640, 480);
gtk_widget_show (menubar2);
gtk_container_add (GTK_CONTAINER (handlebox4), menubar2);
gnome_app_fill_menu (GTK_MENU_SHELL (menubar2), menubar2_uiinfo,
- NULL, FALSE, 0);
+ accel_group, FALSE, 0);
handlebox3 = gtk_handle_box_new ();
gtk_widget_show (handlebox3);
gtk_widget_show (toolbar3);
gtk_container_add (GTK_CONTAINER (handlebox3), toolbar3);
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar3), GTK_TOOLBAR_BOTH);
+ tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar3));
- restore_up_button = gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar3),
- "gtk-go-up",
- NULL,
- NULL, NULL, NULL, -1);
+ restore_up_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-go-up");
gtk_widget_show (restore_up_button);
+ gtk_container_add (GTK_CONTAINER (toolbar3), restore_up_button);
- restore_add_button = gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar3),
- "gtk-add",
- NULL,
- NULL, NULL, NULL, -1);
+ restore_add_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-add");
gtk_widget_show (restore_add_button);
+ gtk_container_add (GTK_CONTAINER (toolbar3), restore_add_button);
- restore_remove_button = gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar3),
- "gtk-remove",
- NULL,
- NULL, NULL, NULL, -1);
+ restore_remove_button = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-remove");
gtk_widget_show (restore_remove_button);
+ gtk_container_add (GTK_CONTAINER (toolbar3), restore_remove_button);
hbox38 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox38);
label88 = gtk_label_new (_("Current dir:"));
gtk_widget_show (label88);
gtk_box_pack_start (GTK_BOX (hbox38), label88, FALSE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label88), GTK_JUSTIFY_CENTER);
restore_dir = gtk_entry_new ();
gtk_widget_show (restore_dir);
FilesSelected = gtk_label_new (_("Files Selected: "));
gtk_widget_show (FilesSelected);
gtk_box_pack_start (GTK_BOX (hbox44), FilesSelected, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (FilesSelected), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (FilesSelected), 0.02, 0.5);
restore_select_ok = gtk_button_new_from_stock ("gtk-ok");
gtk_widget_show (label152);
gtk_box_pack_start (GTK_BOX (hbox44), label152, FALSE, FALSE, 0);
gtk_widget_set_size_request (label152, 34, 16);
- gtk_label_set_justify (GTK_LABEL (label152), GTK_JUSTIFY_LEFT);
restore_select_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (restore_select_cancel);
gtk_box_pack_start (GTK_BOX (hbox44), restore_select_cancel, FALSE, TRUE, 0);
- label1001 = gtk_label_new (" ");
+ label1001 = gtk_label_new (_(" "));
gtk_widget_show (label1001);
gtk_box_pack_start (GTK_BOX (hbox44), label1001, FALSE, FALSE, 8);
- gtk_label_set_justify (GTK_LABEL (label1001), GTK_JUSTIFY_LEFT);
g_signal_connect ((gpointer) restore_file_selection, "delete_event",
- G_CALLBACK (on_restore_files_delete_event),
- NULL);
+ G_CALLBACK (on_restore_files_delete_event),
+ NULL);
g_signal_connect ((gpointer) restore_up_button, "clicked",
- G_CALLBACK (on_restore_up_button_clicked),
- NULL);
+ G_CALLBACK (on_restore_up_button_clicked),
+ NULL);
g_signal_connect ((gpointer) restore_add_button, "clicked",
- G_CALLBACK (on_restore_add_button_clicked),
- NULL);
+ G_CALLBACK (on_restore_add_button_clicked),
+ NULL);
g_signal_connect ((gpointer) restore_remove_button, "clicked",
- G_CALLBACK (on_restore_remove_button_clicked),
- NULL);
+ G_CALLBACK (on_restore_remove_button_clicked),
+ NULL);
g_signal_connect ((gpointer) restore_select_ok, "clicked",
- G_CALLBACK (on_restore_select_ok_clicked),
- NULL);
+ G_CALLBACK (on_restore_select_ok_clicked),
+ NULL);
g_signal_connect ((gpointer) restore_select_cancel, "clicked",
- G_CALLBACK (on_restore_select_cancel_clicked),
- NULL);
+ G_CALLBACK (on_restore_select_cancel_clicked),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (restore_file_selection, restore_file_selection, "restore_file_selection");
GLADE_HOOKUP_OBJECT (restore_file_selection, restore_select_cancel, "restore_select_cancel");
GLADE_HOOKUP_OBJECT (restore_file_selection, label1001, "label1001");
+ gtk_window_add_accel_group (GTK_WINDOW (restore_file_selection), accel_group);
+
return restore_file_selection;
}
label_dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (label_dialog), _("Label a Volume"));
gtk_window_set_modal (GTK_WINDOW (label_dialog), TRUE);
+ gtk_window_set_type_hint (GTK_WINDOW (label_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
dialog_vbox9 = GTK_DIALOG (label_dialog)->vbox;
gtk_widget_show (dialog_vbox9);
label106 = gtk_label_new (_("Label a Volume"));
gtk_widget_show (label106);
gtk_box_pack_start (GTK_BOX (vbox16), label106, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label106), GTK_JUSTIFY_CENTER);
gtk_misc_set_padding (GTK_MISC (label106), 0, 9);
hbox45 = gtk_hbox_new (FALSE, 0);
label107 = gtk_label_new (_("Storage:"));
gtk_widget_show (label107);
gtk_box_pack_start (GTK_BOX (hbox45), label107, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label107), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (label107), 0.15, 0.5);
label_combo_storage = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (label_combo_storage)->popwin),
- "GladeParentKey", label_combo_storage);
+ "GladeParentKey", label_combo_storage);
gtk_widget_show (label_combo_storage);
gtk_box_pack_start (GTK_BOX (hbox45), label_combo_storage, TRUE, TRUE, 15);
gtk_combo_set_value_in_list (GTK_COMBO (label_combo_storage), TRUE, FALSE);
label109 = gtk_label_new (_("Pool:"));
gtk_widget_show (label109);
gtk_box_pack_start (GTK_BOX (hbox46), label109, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label109), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label109), 0.12, 0.5);
label_combo_pool = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (label_combo_pool)->popwin),
- "GladeParentKey", label_combo_pool);
+ "GladeParentKey", label_combo_pool);
gtk_widget_show (label_combo_pool);
gtk_box_pack_start (GTK_BOX (hbox46), label_combo_pool, TRUE, TRUE, 14);
gtk_combo_set_value_in_list (GTK_COMBO (label_combo_pool), TRUE, FALSE);
label111 = gtk_label_new (_("Volume Name:"));
gtk_widget_show (label111);
gtk_box_pack_start (GTK_BOX (hbox47), label111, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label111), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label111), 0.17, 0.5);
label_entry_volume = gtk_entry_new ();
slot1 = gtk_label_new (_("Slot:"));
gtk_widget_show (slot1);
gtk_box_pack_start (GTK_BOX (hbox48), slot1, FALSE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (slot1), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (slot1), 0.09, 0.5);
label_slot_adj = gtk_adjustment_new (0, 0, 10000, 1, 10, 10);
gtk_box_pack_start (GTK_BOX (hbox48), label_slot, TRUE, TRUE, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (label_slot), TRUE);
- label113 = gtk_label_new (" ");
+ label113 = gtk_label_new (_(" "));
gtk_widget_show (label113);
gtk_box_pack_start (GTK_BOX (vbox16), label113, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label113), GTK_JUSTIFY_CENTER);
dialog_action_area8 = GTK_DIALOG (label_dialog)->action_area;
gtk_widget_show (dialog_action_area8);
GTK_WIDGET_SET_FLAGS (label_cancel, GTK_CAN_DEFAULT);
g_signal_connect ((gpointer) label_ok, "clicked",
- G_CALLBACK (on_label_ok_clicked),
- NULL);
+ G_CALLBACK (on_label_ok_clicked),
+ NULL);
g_signal_connect ((gpointer) label_cancel, "clicked",
- G_CALLBACK (on_label_cancel_clicked),
- NULL);
+ G_CALLBACK (on_label_cancel_clicked),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (label_dialog, label_dialog, "label_dialog");
RestoreDialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (RestoreDialog), _("Restore Files Dialog"));
gtk_window_set_default_size (GTK_WINDOW (RestoreDialog), 300, 200);
+ gtk_window_set_type_hint (GTK_WINDOW (RestoreDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
dialog_vbox10 = GTK_DIALOG (RestoreDialog)->vbox;
gtk_widget_show (dialog_vbox10);
label119 = gtk_label_new (_("Restore Files"));
gtk_widget_show (label119);
gtk_box_pack_start (GTK_BOX (vbox18), label119, FALSE, FALSE, 2);
+ gtk_label_set_justify (GTK_LABEL (label119), GTK_JUSTIFY_CENTER);
gtk_misc_set_padding (GTK_MISC (label119), 0, 9);
alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
combo_restore_job = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_job)->popwin),
- "GladeParentKey", combo_restore_job);
+ "GladeParentKey", combo_restore_job);
gtk_widget_show (combo_restore_job);
gtk_box_pack_start (GTK_BOX (hbox51), combo_restore_job, TRUE, TRUE, 1);
gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_job), TRUE, FALSE);
label122 = gtk_label_new ("");
gtk_widget_show (label122);
gtk_box_pack_start (GTK_BOX (hbox51), label122, FALSE, FALSE, 27);
+ gtk_label_set_justify (GTK_LABEL (label122), GTK_JUSTIFY_CENTER);
hbox52 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox52);
combo_restore_client = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_client)->popwin),
- "GladeParentKey", combo_restore_client);
+ "GladeParentKey", combo_restore_client);
gtk_widget_show (combo_restore_client);
gtk_box_pack_start (GTK_BOX (hbox52), combo_restore_client, TRUE, TRUE, 1);
gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_client), TRUE, FALSE);
gtk_widget_show (restore_client_entry);
gtk_editable_set_editable (GTK_EDITABLE (restore_client_entry), FALSE);
- label127 = gtk_label_new (" ");
+ label127 = gtk_label_new (_(" "));
gtk_widget_show (label127);
gtk_box_pack_start (GTK_BOX (hbox52), label127, FALSE, FALSE, 25);
+ gtk_label_set_justify (GTK_LABEL (label127), GTK_JUSTIFY_CENTER);
hbox53 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox53);
combo_restore_fileset = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_fileset)->popwin),
- "GladeParentKey", combo_restore_fileset);
+ "GladeParentKey", combo_restore_fileset);
gtk_widget_show (combo_restore_fileset);
gtk_box_pack_start (GTK_BOX (hbox53), combo_restore_fileset, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_fileset), TRUE, FALSE);
gtk_widget_show (restore_fileset_entry);
gtk_editable_set_editable (GTK_EDITABLE (restore_fileset_entry), FALSE);
- label130 = gtk_label_new (" ");
+ label130 = gtk_label_new (_(" "));
gtk_widget_show (label130);
gtk_box_pack_start (GTK_BOX (hbox53), label130, FALSE, FALSE, 23);
+ gtk_label_set_justify (GTK_LABEL (label130), GTK_JUSTIFY_CENTER);
hbox55 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox55);
gtk_widget_show (label135);
gtk_box_pack_start (GTK_BOX (hbox55), label135, FALSE, FALSE, 0);
gtk_widget_set_size_request (label135, 66, 16);
+ gtk_label_set_justify (GTK_LABEL (label135), GTK_JUSTIFY_CENTER);
combo_restore_pool = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_pool)->popwin),
- "GladeParentKey", combo_restore_pool);
+ "GladeParentKey", combo_restore_pool);
gtk_widget_show (combo_restore_pool);
gtk_box_pack_start (GTK_BOX (hbox55), combo_restore_pool, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_pool), TRUE, FALSE);
gtk_widget_show (restore_pool_entry);
gtk_editable_set_editable (GTK_EDITABLE (restore_pool_entry), FALSE);
- label138 = gtk_label_new (" ");
+ label138 = gtk_label_new (_(" "));
gtk_widget_show (label138);
gtk_box_pack_start (GTK_BOX (hbox55), label138, FALSE, FALSE, 21);
+ gtk_label_set_justify (GTK_LABEL (label138), GTK_JUSTIFY_CENTER);
hbox56 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox56);
gtk_widget_show (label139);
gtk_box_pack_start (GTK_BOX (hbox56), label139, FALSE, FALSE, 0);
gtk_widget_set_size_request (label139, 66, 16);
+ gtk_label_set_justify (GTK_LABEL (label139), GTK_JUSTIFY_CENTER);
combo_restore_storage = gtk_combo_new ();
g_object_set_data (G_OBJECT (GTK_COMBO (combo_restore_storage)->popwin),
- "GladeParentKey", combo_restore_storage);
+ "GladeParentKey", combo_restore_storage);
gtk_widget_show (combo_restore_storage);
gtk_box_pack_start (GTK_BOX (hbox56), combo_restore_storage, TRUE, TRUE, 0);
gtk_combo_set_value_in_list (GTK_COMBO (combo_restore_storage), TRUE, FALSE);
gtk_widget_show (restore_storage_entry);
gtk_editable_set_editable (GTK_EDITABLE (restore_storage_entry), FALSE);
- label142 = gtk_label_new (" ");
+ label142 = gtk_label_new (_(" "));
gtk_widget_show (label142);
gtk_box_pack_start (GTK_BOX (hbox56), label142, FALSE, FALSE, 21);
+ gtk_label_set_justify (GTK_LABEL (label142), GTK_JUSTIFY_CENTER);
hbox59 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox59);
gtk_widget_show (label148);
gtk_box_pack_start (GTK_BOX (hbox59), label148, FALSE, FALSE, 0);
gtk_widget_set_size_request (label148, 66, 16);
+ gtk_label_set_justify (GTK_LABEL (label148), GTK_JUSTIFY_CENTER);
restore_before_entry = gtk_entry_new ();
gtk_widget_show (restore_before_entry);
gtk_box_pack_start (GTK_BOX (hbox59), restore_before_entry, TRUE, TRUE, 0);
- label149 = gtk_label_new (" ");
+ label149 = gtk_label_new (_(" "));
gtk_widget_show (label149);
gtk_box_pack_start (GTK_BOX (hbox59), label149, FALSE, FALSE, 53);
+ gtk_label_set_justify (GTK_LABEL (label149), GTK_JUSTIFY_CENTER);
- label150 = gtk_label_new (" ");
+ label150 = gtk_label_new (_(" "));
gtk_widget_show (label150);
gtk_box_pack_start (GTK_BOX (vbox17), label150, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label150), GTK_JUSTIFY_CENTER);
dialog_action_area9 = GTK_DIALOG (RestoreDialog)->action_area;
gtk_widget_show (dialog_action_area9);
restore_select_button = gtk_label_new_with_mnemonic (_("Select Files"));
gtk_widget_show (restore_select_button);
gtk_box_pack_start (GTK_BOX (hbox49), restore_select_button, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (restore_select_button), GTK_JUSTIFY_LEFT);
restore_cancel = gtk_button_new_from_stock ("gtk-cancel");
gtk_widget_show (restore_cancel);
GTK_WIDGET_SET_FLAGS (restore_cancel, GTK_CAN_DEFAULT);
g_signal_connect ((gpointer) restore_job_entry, "changed",
- G_CALLBACK (on_restore_job_entry_changed),
- NULL);
+ G_CALLBACK (on_restore_job_entry_changed),
+ NULL);
g_signal_connect ((gpointer) select_files_button, "clicked",
- G_CALLBACK (on_select_files_button_clicked),
- NULL);
+ G_CALLBACK (on_select_files_button_clicked),
+ NULL);
g_signal_connect ((gpointer) restore_cancel, "clicked",
- G_CALLBACK (on_restore_cancel_clicked),
- NULL);
+ G_CALLBACK (on_restore_cancel_clicked),
+ NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF (RestoreDialog, RestoreDialog, "RestoreDialog");
progress_dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (progress_dialog), _("Progress"));
+ gtk_window_set_type_hint (GTK_WINDOW (progress_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
dialog_vbox11 = GTK_DIALOG (progress_dialog)->vbox;
gtk_widget_show (dialog_vbox11);
gtk_widget_show (label1002);
gtk_box_pack_start (GTK_BOX (vbox19), label1002, FALSE, FALSE, 0);
gtk_widget_set_size_request (label1002, 0, 43);
- gtk_label_set_justify (GTK_LABEL (label1002), GTK_JUSTIFY_LEFT);
label1003 = gtk_label_new ("");
gtk_widget_show (label1003);
gtk_box_pack_start (GTK_BOX (vbox19), label1003, FALSE, FALSE, 0);
gtk_widget_set_size_request (label1003, 0, 36);
- gtk_label_set_justify (GTK_LABEL (label1003), GTK_JUSTIFY_LEFT);
progressbar1 = gtk_progress_bar_new ();
gtk_widget_show (progressbar1);
gtk_widget_show (label1004);
gtk_box_pack_start (GTK_BOX (vbox19), label1004, FALSE, FALSE, 0);
gtk_widget_set_size_request (label1004, 0, 52);
- gtk_label_set_justify (GTK_LABEL (label1004), GTK_JUSTIFY_LEFT);
dialog_action_area10 = GTK_DIALOG (progress_dialog)->action_area;
gtk_widget_show (dialog_action_area10);
GtkWidget*
lookup_widget (GtkWidget *widget,
- const gchar *widget_name)
+ const gchar *widget_name)
{
GtkWidget *parent, *found_widget;
for (;;)
{
if (GTK_IS_MENU (widget))
- parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
+ parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
else
- parent = widget->parent;
+ parent = widget->parent;
if (!parent)
- parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
+ parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
if (parent == NULL)
- break;
+ break;
widget = parent;
}
found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
- widget_name);
+ widget_name);
if (!found_widget)
- g_warning (_("Widget not found: %s"), widget_name);
+ g_warning ("Widget not found: %s", widget_name);
return found_widget;
}
/* This is an internally used function to create pixmaps. */
GtkWidget*
create_pixmap (GtkWidget *widget,
- const gchar *filename)
+ const gchar *filename)
{
GtkWidget *pixmap;
gchar *pathname;
return gtk_image_new ();
pathname = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
- filename, TRUE, NULL);
+ filename, TRUE, NULL);
if (!pathname)
{
g_warning (_("Couldn't find pixmap file: %s"), filename);
return NULL;
pathname = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
- filename, TRUE, NULL);
+ filename, TRUE, NULL);
if (!pathname)
{
pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
if (!pixbuf)
{
- fprintf (stderr, _("Failed to load pixbuf file: %s: %s\n"),
- pathname, error->message);
+ fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
+ pathname, error->message);
g_error_free (error);
}
g_free (pathname);
/* This is used to set ATK action descriptions. */
void
glade_set_atk_action_description (AtkAction *action,
- const gchar *action_name,
- const gchar *description)
+ const gchar *action_name,
+ const gchar *description)
{
gint n_actions, i;
for (i = 0; i < n_actions; i++)
{
if (!strcmp (atk_action_get_name (action, i), action_name))
- atk_action_set_description (action, i, description);
+ atk_action_set_description (action, i, description);
}
}
* DO NOT EDIT THIS FILE - it is generated by Glade.
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <gnome.h>
+#undef Q_
+#ifdef ENABLE_NLS
+# define Q_(String) g_strip_context ((String), gettext (String))
+#else
+# define Q_(String) g_strip_context ((String), (String))
+#endif
+
+
/*
* Public Functions.
*/
* you want returned.
*/
GtkWidget* lookup_widget (GtkWidget *widget,
- const gchar *widget_name);
+ const gchar *widget_name);
/* This is used to create the pixmaps used in the interface. */
GtkWidget* create_pixmap (GtkWidget *widget,
- const gchar *filename);
+ const gchar *filename);
/* This is used to create the pixbufs used in the interface. */
GdkPixbuf* create_pixbuf (const gchar *filename);
/* This is used to set ATK action descriptions. */
void glade_set_atk_action_description (AtkAction *action,
- const gchar *action_name,
- const gchar *description);
+ const gchar *action_name,
+ const gchar *description);
#include "bacula.h"
-const bool compatible = true;
+const bool compatible = false;
#ifdef TEST_MODE
#include <glob.h>
DEVICE *dev;
BSOCK *user = jcr->dir_bsock;
char dt[MAX_TIME_LENGTH];
- char b1[30], b2[30], b3[30];
+ char b1[35], b2[35], b3[35], b4[35];
int bpb;
bnet_fsend(user, _("\n%s Version: %s (%s) %s %s %s\n"), my_name,
else {
bnet_fsend(user, _("Daemon started %s, %d Jobs run since started.\n"), dt, num_jobs_run);
}
- if (debug_level > 0) {
- char b1[35], b2[35], b3[35], b4[35];
- bnet_fsend(user, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
- edit_uint64_with_commas(sm_bytes, b1),
- edit_uint64_with_commas(sm_max_bytes, b2),
- edit_uint64_with_commas(sm_buffers, b3),
- edit_uint64_with_commas(sm_max_buffers, b4));
- }
+ bnet_fsend(user, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
+ edit_uint64_with_commas(sm_bytes, b1),
+ edit_uint64_with_commas(sm_max_bytes, b2),
+ edit_uint64_with_commas(sm_buffers, b3),
+ edit_uint64_with_commas(sm_max_buffers, b4));
/*
* List running jobs
*/
#undef VERSION
-#define VERSION "1.39.9"
-#define BDATE "22 April 2006"
-#define LSMDATE "22Apr06"
+#define VERSION "1.39.10"
+#define BDATE "23 April 2006"
+#define LSMDATE "23Apr06"
/* Debug flags */
#undef DEBUG
projects / bacula / bacula / commitdiff