diff options
| author | rbuj <[email protected]> | 2020-01-26 11:04:49 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-02-06 12:59:42 +0100 |
| commit | a956971b492c65c452dbab46bb81cafb9e0e85d0 (patch) | |
| tree | a86f7168a6e0175d1b0255634c26d883ca52f414 | |
| parent | d555de986b694c23ef7ced8d3204933c69ae4b41 (diff) | |
| download | caja-extensions-a956971b492c65c452dbab46bb81cafb9e0e85d0.tar.bz2 caja-extensions-a956971b492c65c452dbab46bb81cafb9e0e85d0.tar.xz | |
caja-sendto: rewrite caja-sendto.ui from scratch fixing deprecations
| -rw-r--r-- | sendto/caja-sendto-command.c | 21 | ||||
| -rw-r--r-- | sendto/caja-sendto.ui | 554 |
2 files changed, 189 insertions, 386 deletions
diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c index 6c16647..0d002cb 100644 --- a/sendto/caja-sendto-command.c +++ b/sendto/caja-sendto-command.c @@ -200,24 +200,9 @@ pack_files (NS_ui *ui) g_mkdir (tmp_work_dir, 0700); g_free (tmp_dir); - switch (gtk_combo_box_get_active (GTK_COMBO_BOX(ui->pack_combobox))) - { - case 0: - pack_type = g_strdup (".7z"); - break; - case 1: - pack_type = g_strdup (".tar.bz2"); - break; - case 2: - pack_type = g_strdup (".tar.gz"); - break; - case 3: - pack_type = g_strdup (".tar.xz"); - break; - case 4: - pack_type = g_strdup (".zip"); - break; - default: + if (gtk_combo_box_get_active (GTK_COMBO_BOX(ui->pack_combobox)) != 0) { + pack_type = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(ui->pack_combobox)); + } else { pack_type = NULL; g_assert_not_reached (); } diff --git a/sendto/caja-sendto.ui b/sendto/caja-sendto.ui index b78c068..c5a86e6 100644 --- a/sendto/caja-sendto.ui +++ b/sendto/caja-sendto.ui @@ -1,504 +1,322 @@ -<?xml version="1.0"?> -<!--*- mode: xml -*--> +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.1 --> <interface> - <object class="GtkListStore" id="model1"> - <columns> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0">.7z</col> - </row> - <row> - <col id="0">.tar.bz2</col> - </row> - <row> - <col id="0">.tar.gz</col> - </row> - <row> - <col id="0">.tar.xz</col> - </row> - <row> - <col id="0">.zip</col> - </row> - </data> + <requires lib="gtk+" version="3.20"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-send</property> </object> - <object class="GtkDialog" id="caja_sendto_dialog"> - <property name="border_width">5</property> - <property name="width_request">370</property> + <object class="GtkImage" id="image2"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-cancel</property> + </object> + <object class="GtkDialog" id="caja_sendto_dialog"> + <property name="can_focus">False</property> <property name="title" translatable="yes">Send To...</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_CENTER</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="urgency_hint">False</property> <property name="icon_name">document-send</property> + <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="margin_right">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> - <property name="can_default">True</property> <property name="can_focus">True</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="receives_default">True</property> + <property name="image">image2</property> + <property name="use_underline">True</property> + <property name="always_show_image">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> <object class="GtkButton" id="send_button"> + <property name="label" translatable="yes">Send</property> <property name="visible">True</property> - <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> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <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> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="icon_name">document-send</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Send</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <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> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </object> - </child> - </object> - </child> + <property name="receives_default">True</property> + <property name="image">image1</property> + <property name="always_show_image">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> + <property name="fill">False</property> + <property name="padding">8</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> - <property name="border_width">5</property> + <object class="GtkBox"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">18</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkFrame"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Destination</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment"> <property name="visible">True</property> - <property name="xalign">0.5</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="can_focus">False</property> <property name="left_padding">12</property> - <property name="right_padding">0</property> <child> - <object class="GtkTable" id="table2"> + <object class="GtkGrid"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can_focus">False</property> + <property name="margin_top">8</property> + <property name="row_spacing">8</property> + <property name="column_spacing">8</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkComboBox" id="options_combobox"> <property name="visible">True</property> - <property name="label" translatable="yes">Send _as:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">options_combobox</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> + <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"/> </packing> </child> <child> - <object class="GtkComboBox" id="options_combobox"> + <object class="GtkAccelLabel" id="send_to_label"> <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Send _as:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">options_combobox</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options">fill</property> </packing> </child> <child> - <object class="GtkLabel" id="send_to_label"> + <object class="GtkAccelLabel"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Send t_o:</property> <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> </object> <packing> <property name="left_attach">0</property> - <property name="right_attach">1</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"/> </packing> </child> <child> - <object class="GtkHBox" id="hbox_contacts_widgets"> + <object class="GtkBox" id="hbox_contacts_widgets"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> <placeholder/> </child> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> </packing> </child> </object> </child> </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Destination</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> <packing> - <property name="padding">6</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkFrame"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Compression</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment"> <property name="visible">True</property> - <property name="xalign">0.5</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="can_focus">False</property> <property name="left_padding">12</property> - <property name="right_padding">0</property> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="can_focus">False</property> + <property name="margin_top">8</property> + <property name="orientation">vertical</property> + <property name="spacing">8</property> <child> <object class="GtkCheckButton" id="pack_checkbutton"> + <property name="label" translatable="yes">Send _packed in:</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Send _packed in:</property> + <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="xalign">0.5</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">12</property> - <property name="right_padding">0</property> + <property name="can_focus">False</property> + <property name="spacing">8</property> + <child> + <object class="GtkEntry" id="pack_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkComboBoxText" id="pack_combobox"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkEntry" id="pack_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"/> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="pack_combobox"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <property name="model">model1</property> - <property name="active">4</property> - <child> - <object class="GtkCellRendererText" id="renderer1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="active_id">4</property> + <items> + <item>.7z</item> + <item>.tar.bz2</item> + <item>.tar.gz</item> + <item>.tar.xz</item> + <item>.zip</item> + </items> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> </child> </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Compression</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> </child> </object> <packing> - <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="status_box"> + <property name="sensitive">False</property> + <property name="can_focus">False</property> <child> - <object class="GtkHBox" id="status_box"> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="status_image"> - <property name="stock">gtk-dialog-error</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="label"> </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> + <object class="GtkImage" id="status_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="icon_name">dialog-error</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">label</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">3</property> </packing> </child> </object> </child> <action-widgets> <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">send_button</action-widget> + <action-widget response="-3">send_button</action-widget> </action-widgets> </object> </interface> |