|
 |
8be0b6 |
From e71b54bafcbfffcb352600ebff4be8776de171f9 Mon Sep 17 00:00:00 2001
|
|
|
8be0b6 |
From: Ondrej Holy <oholy@redhat.com>
|
|
|
8be0b6 |
Date: Fri, 30 Jul 2021 11:01:42 +0200
|
|
|
8be0b6 |
Subject: [PATCH] compress-dialog: Update dialog design
|
|
|
8be0b6 |
|
|
|
8be0b6 |
Let's update the Compress dialog design as per the mockup for the
|
|
|
8be0b6 |
encrypted archives support. The most visible change is `GtkPopover`
|
|
|
8be0b6 |
with `HdyActionRow` rows for the format selection instead of the
|
|
|
8be0b6 |
`GtkRadioButton` buttons.
|
|
|
8be0b6 |
|
|
|
8be0b6 |
https://gitlab.gnome.org/GNOME/nautilus/-/issues/822
|
|
|
8be0b6 |
---
|
|
|
8be0b6 |
src/nautilus-compress-dialog-controller.c | 132 ++++++-----
|
|
|
8be0b6 |
src/resources/ui/nautilus-compress-dialog.ui | 229 ++++++++++---------
|
|
|
8be0b6 |
2 files changed, 199 insertions(+), 162 deletions(-)
|
|
|
8be0b6 |
|
|
|
8be0b6 |
diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c
|
|
|
8be0b6 |
index d8aa792ee..154573c0f 100644
|
|
|
8be0b6 |
--- a/src/nautilus-compress-dialog-controller.c
|
|
|
8be0b6 |
+++ b/src/nautilus-compress-dialog-controller.c
|
|
|
8be0b6 |
@@ -19,6 +19,7 @@
|
|
|
8be0b6 |
|
|
|
8be0b6 |
#include <glib/gi18n.h>
|
|
|
8be0b6 |
#include <gnome-autoar/gnome-autoar.h>
|
|
|
8be0b6 |
+#include <libhandy-1/handy.h>
|
|
|
8be0b6 |
|
|
|
8be0b6 |
#include <eel/eel-vfs-extensions.h>
|
|
|
8be0b6 |
|
|
|
8be0b6 |
@@ -31,11 +32,15 @@ struct _NautilusCompressDialogController
|
|
|
8be0b6 |
NautilusFileNameWidgetController parent_instance;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
GtkWidget *compress_dialog;
|
|
|
8be0b6 |
- GtkWidget *description_stack;
|
|
|
8be0b6 |
GtkWidget *name_entry;
|
|
|
8be0b6 |
- GtkWidget *zip_radio_button;
|
|
|
8be0b6 |
- GtkWidget *tar_xz_radio_button;
|
|
|
8be0b6 |
- GtkWidget *seven_zip_radio_button;
|
|
|
8be0b6 |
+ GtkWidget *extension_stack;
|
|
|
8be0b6 |
+ GtkWidget *zip_label;
|
|
|
8be0b6 |
+ GtkWidget *tar_xz_label;
|
|
|
8be0b6 |
+ GtkWidget *seven_zip_label;
|
|
|
8be0b6 |
+ GtkWidget *extension_popover;
|
|
|
8be0b6 |
+ GtkWidget *zip_checkmark;
|
|
|
8be0b6 |
+ GtkWidget *tar_xz_checkmark;
|
|
|
8be0b6 |
+ GtkWidget *seven_zip_checkmark;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
const char *extension;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
@@ -135,32 +140,32 @@ update_selected_format (NautilusCompressDialogController *self,
|
|
|
8be0b6 |
NautilusCompressionFormat format)
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
const char *extension;
|
|
|
8be0b6 |
- const char *description_label_name;
|
|
|
8be0b6 |
- GtkWidget *active_button;
|
|
|
8be0b6 |
+ GtkWidget *active_label;
|
|
|
8be0b6 |
+ GtkWidget *active_checkmark;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
switch (format)
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
case NAUTILUS_COMPRESSION_ZIP:
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
extension = ".zip";
|
|
|
8be0b6 |
- description_label_name = "zip-description-label";
|
|
|
8be0b6 |
- active_button = self->zip_radio_button;
|
|
|
8be0b6 |
+ active_label = self->zip_label;
|
|
|
8be0b6 |
+ active_checkmark = self->zip_checkmark;
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
break;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
case NAUTILUS_COMPRESSION_TAR_XZ:
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
extension = ".tar.xz";
|
|
|
8be0b6 |
- description_label_name = "tar-xz-description-label";
|
|
|
8be0b6 |
- active_button = self->tar_xz_radio_button;
|
|
|
8be0b6 |
+ active_label = self->tar_xz_label;
|
|
|
8be0b6 |
+ active_checkmark = self->tar_xz_checkmark;
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
break;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
case NAUTILUS_COMPRESSION_7ZIP:
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
extension = ".7z";
|
|
|
8be0b6 |
- description_label_name = "seven-zip-description-label";
|
|
|
8be0b6 |
- active_button = self->seven_zip_radio_button;
|
|
|
8be0b6 |
+ active_label = self->seven_zip_label;
|
|
|
8be0b6 |
+ active_checkmark = self->seven_zip_checkmark;
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
break;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
@@ -173,11 +178,21 @@ update_selected_format (NautilusCompressDialogController *self,
|
|
|
8be0b6 |
|
|
|
8be0b6 |
self->extension = extension;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
- gtk_stack_set_visible_child_name (GTK_STACK (self->description_stack),
|
|
|
8be0b6 |
- description_label_name);
|
|
|
8be0b6 |
-
|
|
|
8be0b6 |
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (active_button),
|
|
|
8be0b6 |
- TRUE);
|
|
|
8be0b6 |
+ gtk_stack_set_visible_child (GTK_STACK (self->extension_stack),
|
|
|
8be0b6 |
+ active_label);
|
|
|
8be0b6 |
+
|
|
|
8be0b6 |
+ gtk_image_set_from_icon_name (GTK_IMAGE (self->zip_checkmark),
|
|
|
8be0b6 |
+ NULL,
|
|
|
8be0b6 |
+ GTK_ICON_SIZE_BUTTON);
|
|
|
8be0b6 |
+ gtk_image_set_from_icon_name (GTK_IMAGE (self->tar_xz_checkmark),
|
|
|
8be0b6 |
+ NULL,
|
|
|
8be0b6 |
+ GTK_ICON_SIZE_BUTTON);
|
|
|
8be0b6 |
+ gtk_image_set_from_icon_name (GTK_IMAGE (self->seven_zip_checkmark),
|
|
|
8be0b6 |
+ NULL,
|
|
|
8be0b6 |
+ GTK_ICON_SIZE_BUTTON);
|
|
|
8be0b6 |
+ gtk_image_set_from_icon_name (GTK_IMAGE (active_checkmark),
|
|
|
8be0b6 |
+ "object-select-symbolic",
|
|
|
8be0b6 |
+ GTK_ICON_SIZE_BUTTON);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
g_settings_set_enum (nautilus_compression_preferences,
|
|
|
8be0b6 |
NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT,
|
|
|
8be0b6 |
@@ -189,52 +204,40 @@ update_selected_format (NautilusCompressDialogController *self,
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
|
|
|
8be0b6 |
static void
|
|
|
8be0b6 |
-zip_radio_button_on_toggled (GtkToggleButton *toggle_button,
|
|
|
8be0b6 |
- gpointer user_data)
|
|
|
8be0b6 |
+zip_row_on_activated (HdyActionRow *row,
|
|
|
8be0b6 |
+ gpointer user_data)
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
NautilusCompressDialogController *controller;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
- if (!gtk_toggle_button_get_active (toggle_button))
|
|
|
8be0b6 |
- {
|
|
|
8be0b6 |
- return;
|
|
|
8be0b6 |
- }
|
|
|
8be0b6 |
-
|
|
|
8be0b6 |
+ gtk_popover_popdown (GTK_POPOVER (controller->extension_popover));
|
|
|
8be0b6 |
update_selected_format (controller,
|
|
|
8be0b6 |
NAUTILUS_COMPRESSION_ZIP);
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
|
|
|
8be0b6 |
static void
|
|
|
8be0b6 |
-tar_xz_radio_button_on_toggled (GtkToggleButton *toggle_button,
|
|
|
8be0b6 |
- gpointer user_data)
|
|
|
8be0b6 |
+tar_xz_row_on_activated (HdyActionRow *row,
|
|
|
8be0b6 |
+ gpointer user_data)
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
NautilusCompressDialogController *controller;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
- if (!gtk_toggle_button_get_active (toggle_button))
|
|
|
8be0b6 |
- {
|
|
|
8be0b6 |
- return;
|
|
|
8be0b6 |
- }
|
|
|
8be0b6 |
-
|
|
|
8be0b6 |
+ gtk_popover_popdown (GTK_POPOVER (controller->extension_popover));
|
|
|
8be0b6 |
update_selected_format (controller,
|
|
|
8be0b6 |
NAUTILUS_COMPRESSION_TAR_XZ);
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
|
|
|
8be0b6 |
static void
|
|
|
8be0b6 |
-seven_zip_radio_button_on_toggled (GtkToggleButton *toggle_button,
|
|
|
8be0b6 |
- gpointer user_data)
|
|
|
8be0b6 |
+seven_zip_row_on_activated (HdyActionRow *row,
|
|
|
8be0b6 |
+ gpointer user_data)
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
NautilusCompressDialogController *controller;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
- if (!gtk_toggle_button_get_active (toggle_button))
|
|
|
8be0b6 |
- {
|
|
|
8be0b6 |
- return;
|
|
|
8be0b6 |
- }
|
|
|
8be0b6 |
-
|
|
|
8be0b6 |
+ gtk_popover_popdown (GTK_POPOVER (controller->extension_popover));
|
|
|
8be0b6 |
update_selected_format (controller,
|
|
|
8be0b6 |
NAUTILUS_COMPRESSION_7ZIP);
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
@@ -251,10 +254,14 @@ nautilus_compress_dialog_controller_new (GtkWindow *parent_window,
|
|
|
8be0b6 |
GtkWidget *error_label;
|
|
|
8be0b6 |
GtkWidget *name_entry;
|
|
|
8be0b6 |
GtkWidget *activate_button;
|
|
|
8be0b6 |
- GtkWidget *description_stack;
|
|
|
8be0b6 |
- GtkWidget *zip_radio_button;
|
|
|
8be0b6 |
- GtkWidget *tar_xz_radio_button;
|
|
|
8be0b6 |
- GtkWidget *seven_zip_radio_button;
|
|
|
8be0b6 |
+ GtkWidget *extension_stack;
|
|
|
8be0b6 |
+ GtkWidget *zip_label;
|
|
|
8be0b6 |
+ GtkWidget *tar_xz_label;
|
|
|
8be0b6 |
+ GtkWidget *seven_zip_label;
|
|
|
8be0b6 |
+ GtkWidget *extension_popover;
|
|
|
8be0b6 |
+ GtkWidget *zip_checkmark;
|
|
|
8be0b6 |
+ GtkWidget *tar_xz_checkmark;
|
|
|
8be0b6 |
+ GtkWidget *seven_zip_checkmark;
|
|
|
8be0b6 |
NautilusCompressionFormat format;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-compress-dialog.ui");
|
|
|
8be0b6 |
@@ -263,10 +270,14 @@ nautilus_compress_dialog_controller_new (GtkWindow *parent_window,
|
|
|
8be0b6 |
error_label = GTK_WIDGET (gtk_builder_get_object (builder, "error_label"));
|
|
|
8be0b6 |
name_entry = GTK_WIDGET (gtk_builder_get_object (builder, "name_entry"));
|
|
|
8be0b6 |
activate_button = GTK_WIDGET (gtk_builder_get_object (builder, "activate_button"));
|
|
|
8be0b6 |
- zip_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "zip_radio_button"));
|
|
|
8be0b6 |
- tar_xz_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "tar_xz_radio_button"));
|
|
|
8be0b6 |
- seven_zip_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "seven_zip_radio_button"));
|
|
|
8be0b6 |
- description_stack = GTK_WIDGET (gtk_builder_get_object (builder, "description_stack"));
|
|
|
8be0b6 |
+ extension_stack = GTK_WIDGET (gtk_builder_get_object (builder, "extension_stack"));
|
|
|
8be0b6 |
+ zip_label = GTK_WIDGET (gtk_builder_get_object (builder, "zip_label"));
|
|
|
8be0b6 |
+ tar_xz_label = GTK_WIDGET (gtk_builder_get_object (builder, "tar_xz_label"));
|
|
|
8be0b6 |
+ seven_zip_label = GTK_WIDGET (gtk_builder_get_object (builder, "seven_zip_label"));
|
|
|
8be0b6 |
+ extension_popover = GTK_WIDGET (gtk_builder_get_object (builder, "extension_popover"));
|
|
|
8be0b6 |
+ zip_checkmark = GTK_WIDGET (gtk_builder_get_object (builder, "zip_checkmark"));
|
|
|
8be0b6 |
+ tar_xz_checkmark = GTK_WIDGET (gtk_builder_get_object (builder, "tar_xz_checkmark"));
|
|
|
8be0b6 |
+ seven_zip_checkmark = GTK_WIDGET (gtk_builder_get_object (builder, "seven_zip_checkmark"));
|
|
|
8be0b6 |
|
|
|
8be0b6 |
gtk_window_set_transient_for (GTK_WINDOW (compress_dialog),
|
|
|
8be0b6 |
parent_window);
|
|
|
8be0b6 |
@@ -279,10 +290,15 @@ nautilus_compress_dialog_controller_new (GtkWindow *parent_window,
|
|
|
8be0b6 |
"containing-directory", destination_directory, NULL);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
self->compress_dialog = compress_dialog;
|
|
|
8be0b6 |
- self->zip_radio_button = zip_radio_button;
|
|
|
8be0b6 |
- self->tar_xz_radio_button = tar_xz_radio_button;
|
|
|
8be0b6 |
- self->seven_zip_radio_button = seven_zip_radio_button;
|
|
|
8be0b6 |
- self->description_stack = description_stack;
|
|
|
8be0b6 |
+ self->extension_stack = extension_stack;
|
|
|
8be0b6 |
+ self->zip_label = zip_label;
|
|
|
8be0b6 |
+ self->tar_xz_label = tar_xz_label;
|
|
|
8be0b6 |
+ self->seven_zip_label = seven_zip_label;
|
|
|
8be0b6 |
+ self->name_entry = name_entry;
|
|
|
8be0b6 |
+ self->extension_popover = extension_popover;
|
|
|
8be0b6 |
+ self->zip_checkmark = zip_checkmark;
|
|
|
8be0b6 |
+ self->tar_xz_checkmark = tar_xz_checkmark;
|
|
|
8be0b6 |
+ self->seven_zip_checkmark = seven_zip_checkmark;
|
|
|
8be0b6 |
self->name_entry = name_entry;
|
|
|
8be0b6 |
|
|
|
8be0b6 |
self->response_handler_id = g_signal_connect (compress_dialog,
|
|
|
8be0b6 |
@@ -291,20 +307,18 @@ nautilus_compress_dialog_controller_new (GtkWindow *parent_window,
|
|
|
8be0b6 |
self);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
gtk_builder_add_callback_symbols (builder,
|
|
|
8be0b6 |
- "zip_radio_button_on_toggled",
|
|
|
8be0b6 |
- G_CALLBACK (zip_radio_button_on_toggled),
|
|
|
8be0b6 |
- "tar_xz_radio_button_on_toggled",
|
|
|
8be0b6 |
- G_CALLBACK (tar_xz_radio_button_on_toggled),
|
|
|
8be0b6 |
- "seven_zip_radio_button_on_toggled",
|
|
|
8be0b6 |
- G_CALLBACK (seven_zip_radio_button_on_toggled),
|
|
|
8be0b6 |
+ "zip_row_on_activated",
|
|
|
8be0b6 |
+ G_CALLBACK (zip_row_on_activated),
|
|
|
8be0b6 |
+ "tar_xz_row_on_activated",
|
|
|
8be0b6 |
+ G_CALLBACK (tar_xz_row_on_activated),
|
|
|
8be0b6 |
+ "seven_zip_row_on_activated",
|
|
|
8be0b6 |
+ G_CALLBACK (seven_zip_row_on_activated),
|
|
|
8be0b6 |
NULL);
|
|
|
8be0b6 |
gtk_builder_connect_signals (builder, self);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
format = g_settings_get_enum (nautilus_compression_preferences,
|
|
|
8be0b6 |
NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
- update_selected_format (self, format);
|
|
|
8be0b6 |
-
|
|
|
8be0b6 |
if (initial_name != NULL)
|
|
|
8be0b6 |
{
|
|
|
8be0b6 |
gtk_entry_set_text (GTK_ENTRY (name_entry), initial_name);
|
|
|
8be0b6 |
@@ -312,6 +326,8 @@ nautilus_compress_dialog_controller_new (GtkWindow *parent_window,
|
|
|
8be0b6 |
|
|
|
8be0b6 |
gtk_widget_show_all (compress_dialog);
|
|
|
8be0b6 |
|
|
|
8be0b6 |
+ update_selected_format (self, format);
|
|
|
8be0b6 |
+
|
|
|
8be0b6 |
return self;
|
|
|
8be0b6 |
}
|
|
|
8be0b6 |
|
|
|
8be0b6 |
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
|
|
|
8be0b6 |
index 526e9eed2..b36539294 100644
|
|
|
8be0b6 |
--- a/src/resources/ui/nautilus-compress-dialog.ui
|
|
|
8be0b6 |
+++ b/src/resources/ui/nautilus-compress-dialog.ui
|
|
|
8be0b6 |
@@ -1,6 +1,70 @@
|
|
|
8be0b6 |
|
|
|
8be0b6 |
<interface>
|
|
|
8be0b6 |
<requires lib="gtk+" version="3.14"/>
|
|
|
8be0b6 |
+ <object class="GtkPopover" id="extension_popover">
|
|
|
8be0b6 |
+ <property name="position">bottom</property>
|
|
|
8be0b6 |
+ <property name="constrain-to">none</property>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="HdyPreferencesGroup">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="margin-top">12</property>
|
|
|
8be0b6 |
+ <property name="margin-bottom">12</property>
|
|
|
8be0b6 |
+ <property name="margin-start">12</property>
|
|
|
8be0b6 |
+ <property name="margin-end">12</property>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="HdyActionRow">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="activatable">True</property>
|
|
|
8be0b6 |
+ <property name="title" translatable="no">.zip</property>
|
|
|
8be0b6 |
+ <property name="subtitle" translatable="yes">Compatible with all operating systems.</property>
|
|
|
8be0b6 |
+ <signal name="activated" handler="zip_row_on_activated"/>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkImage" id="zip_checkmark">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="width-request">16</property>
|
|
|
8be0b6 |
+ <property name="margin-start">12</property>
|
|
|
8be0b6 |
+ <property name="margin-end">12</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="HdyActionRow">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="activatable">True</property>
|
|
|
8be0b6 |
+ <property name="title" translatable="no">.tar.xz</property>
|
|
|
8be0b6 |
+ <property name="subtitle" translatable="yes">Smaller archives but Linux and Mac only.</property>
|
|
|
8be0b6 |
+ <signal name="activated" handler="tar_xz_row_on_activated"/>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkImage" id="tar_xz_checkmark">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="width-request">16</property>
|
|
|
8be0b6 |
+ <property name="margin-start">12</property>
|
|
|
8be0b6 |
+ <property name="margin-end">12</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="HdyActionRow">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="activatable">True</property>
|
|
|
8be0b6 |
+ <property name="title" translatable="no">.7z</property>
|
|
|
8be0b6 |
+ <property name="subtitle" translatable="yes">Smaller archives but must be installed on Windows and Mac.</property>
|
|
|
8be0b6 |
+ <signal name="activated" handler="seven_zip_row_on_activated"/>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkImage" id="seven_zip_checkmark">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="width-request">16</property>
|
|
|
8be0b6 |
+ <property name="margin-start">12</property>
|
|
|
8be0b6 |
+ <property name="margin-end">12</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
<object class="GtkDialog" id="compress_dialog">
|
|
|
8be0b6 |
<property name="title" translatable="yes">Create Archive</property>
|
|
|
8be0b6 |
<property name="resizable">False</property>
|
|
|
8be0b6 |
@@ -9,19 +73,26 @@
|
|
|
8be0b6 |
<property name="destroy_with_parent">True</property>
|
|
|
8be0b6 |
<property name="type_hint">dialog</property>
|
|
|
8be0b6 |
<property name="use-header-bar">1</property>
|
|
|
8be0b6 |
+ <property name="default-width">500</property>
|
|
|
8be0b6 |
+ <property name="default-height">210</property>
|
|
|
8be0b6 |
<child internal-child="vbox">
|
|
|
8be0b6 |
<object class="GtkBox" id="vbox">
|
|
|
8be0b6 |
<property name="orientation">vertical</property>
|
|
|
8be0b6 |
- <property name="margin_top">18</property>
|
|
|
8be0b6 |
- <property name="margin_bottom">12</property>
|
|
|
8be0b6 |
- <property name="margin_start">18</property>
|
|
|
8be0b6 |
- <property name="margin_end">18</property>
|
|
|
8be0b6 |
+ <property name="margin-top">30</property>
|
|
|
8be0b6 |
+ <property name="margin-bottom">30</property>
|
|
|
8be0b6 |
+ <property name="margin-start">30</property>
|
|
|
8be0b6 |
+ <property name="margin-end">30</property>
|
|
|
8be0b6 |
+ <property name="width-request">390</property>
|
|
|
8be0b6 |
+ <property name="halign">center</property>
|
|
|
8be0b6 |
<property name="spacing">6</property>
|
|
|
8be0b6 |
<child>
|
|
|
8be0b6 |
<object class="GtkLabel" id="name_label">
|
|
|
8be0b6 |
<property name="label" translatable="yes">Archive name</property>
|
|
|
8be0b6 |
<property name="visible">True</property>
|
|
|
8be0b6 |
<property name="xalign">0</property>
|
|
|
8be0b6 |
+ <attributes>
|
|
|
8be0b6 |
+ <attribute name="weight" value="bold"/>
|
|
|
8be0b6 |
+ </attributes>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
<packing>
|
|
|
8be0b6 |
<property name="expand">False</property>
|
|
|
8be0b6 |
@@ -30,132 +101,82 @@
|
|
|
8be0b6 |
</packing>
|
|
|
8be0b6 |
</child>
|
|
|
8be0b6 |
<child>
|
|
|
8be0b6 |
- <object class="GtkEntry" id="name_entry">
|
|
|
8be0b6 |
- <property name="visible">True</property>
|
|
|
8be0b6 |
- <property name="can_focus">True</property>
|
|
|
8be0b6 |
- </object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="expand">False</property>
|
|
|
8be0b6 |
- <property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">2</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
- </child>
|
|
|
8be0b6 |
- <child>
|
|
|
8be0b6 |
- <object class="GtkRevealer" id="error_revealer">
|
|
|
8be0b6 |
- <child>
|
|
|
8be0b6 |
- <object class="GtkLabel" id="error_label">
|
|
|
8be0b6 |
- <property name="margin_top">4</property>
|
|
|
8be0b6 |
- <property name="margin_bottom">4</property>
|
|
|
8be0b6 |
- <property name="visible">True</property>
|
|
|
8be0b6 |
- <property name="xalign">0</property>
|
|
|
8be0b6 |
- </object>
|
|
|
8be0b6 |
- </child>
|
|
|
8be0b6 |
- </object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="expand">False</property>
|
|
|
8be0b6 |
- <property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">3</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
- </child>
|
|
|
8be0b6 |
- <child>
|
|
|
8be0b6 |
- <object class="GtkBox" id="hbox">
|
|
|
8be0b6 |
+ <object class="GtkBox">
|
|
|
8be0b6 |
<property name="orientation">horizontal</property>
|
|
|
8be0b6 |
- <property name="homogeneous">True</property>
|
|
|
8be0b6 |
- <property name="spacing">0</property>
|
|
|
8be0b6 |
- <child>
|
|
|
8be0b6 |
- <object class="GtkRadioButton" id="zip_radio_button">
|
|
|
8be0b6 |
- <property name="label" translatable="no">.zip</property>
|
|
|
8be0b6 |
- <property name="draw_indicator">True</property>
|
|
|
8be0b6 |
- <signal name="toggled" handler="zip_radio_button_on_toggled"/>
|
|
|
8be0b6 |
- </object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="expand">True</property>
|
|
|
8be0b6 |
- <property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">0</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
- </child>
|
|
|
8be0b6 |
+ <property name="spacing">12</property>
|
|
|
8be0b6 |
<child>
|
|
|
8be0b6 |
- <object class="GtkRadioButton" id="tar_xz_radio_button">
|
|
|
8be0b6 |
- <property name="label" translatable="no">.tar.xz</property>
|
|
|
8be0b6 |
- <property name="group">zip_radio_button</property>
|
|
|
8be0b6 |
- <property name="draw_indicator">True</property>
|
|
|
8be0b6 |
- <signal name="toggled" handler="tar_xz_radio_button_on_toggled"/>
|
|
|
8be0b6 |
+ <object class="GtkEntry" id="name_entry">
|
|
|
8be0b6 |
+ <property name="visible">True</property>
|
|
|
8be0b6 |
+ <property name="can_focus">True</property>
|
|
|
8be0b6 |
+ <property name="width-chars">30</property>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
<packing>
|
|
|
8be0b6 |
<property name="expand">True</property>
|
|
|
8be0b6 |
- <property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">1</property>
|
|
|
8be0b6 |
</packing>
|
|
|
8be0b6 |
</child>
|
|
|
8be0b6 |
<child>
|
|
|
8be0b6 |
- <object class="GtkRadioButton" id="seven_zip_radio_button">
|
|
|
8be0b6 |
- <property name="label" translatable="no">.7z</property>
|
|
|
8be0b6 |
- <property name="group">zip_radio_button</property>
|
|
|
8be0b6 |
- <property name="draw_indicator">True</property>
|
|
|
8be0b6 |
- <signal name="toggled" handler="seven_zip_radio_button_on_toggled"/>
|
|
|
8be0b6 |
+ <object class="GtkMenuButton" id="extension_button">
|
|
|
8be0b6 |
+ <property name="popover">extension_popover</property>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkBox">
|
|
|
8be0b6 |
+ <property name="orientation">horizontal</property>
|
|
|
8be0b6 |
+ <property name="spacing">6</property>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkStack" id="extension_stack">
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkLabel" id="zip_label">
|
|
|
8be0b6 |
+ <property name="label" translatable="no">.zip</property>
|
|
|
8be0b6 |
+ <property name="xalign">0</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkLabel" id="tar_xz_label">
|
|
|
8be0b6 |
+ <property name="label" translatable="no">.tar.xz</property>
|
|
|
8be0b6 |
+ <property name="xalign">0</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkLabel" id="seven_zip_label">
|
|
|
8be0b6 |
+ <property name="label" translatable="no">.7z</property>
|
|
|
8be0b6 |
+ <property name="xalign">0</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ <packing>
|
|
|
8be0b6 |
+ <property name="expand">True</property>
|
|
|
8be0b6 |
+ </packing>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ <child>
|
|
|
8be0b6 |
+ <object class="GtkImage">
|
|
|
8be0b6 |
+ <property name="icon-name">pan-down-symbolic</property>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
+ </object>
|
|
|
8be0b6 |
+ </child>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="expand">True</property>
|
|
|
8be0b6 |
- <property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">2</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
</child>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
<packing>
|
|
|
8be0b6 |
<property name="expand">False</property>
|
|
|
8be0b6 |
<property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">4</property>
|
|
|
8be0b6 |
+ <property name="position">2</property>
|
|
|
8be0b6 |
</packing>
|
|
|
8be0b6 |
</child>
|
|
|
8be0b6 |
<child>
|
|
|
8be0b6 |
- <object class="GtkStack" id="description_stack">
|
|
|
8be0b6 |
- <property name="visible">True</property>
|
|
|
8be0b6 |
- <property name="can_focus">False</property>
|
|
|
8be0b6 |
- <property name="homogeneous">True</property>
|
|
|
8be0b6 |
- <child>
|
|
|
8be0b6 |
- <object class="GtkLabel" id="zip_description_label">
|
|
|
8be0b6 |
- <property name="visible">True</property>
|
|
|
8be0b6 |
- <property name="label" translatable="yes">Compatible with all operating systems.</property>
|
|
|
8be0b6 |
- <property name="xalign">0</property>
|
|
|
8be0b6 |
- <style>
|
|
|
8be0b6 |
- <class name="dim-label"/>
|
|
|
8be0b6 |
- </style>
|
|
|
8be0b6 |
- </object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="name">zip-description-label</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
- </child>
|
|
|
8be0b6 |
- <child>
|
|
|
8be0b6 |
- <object class="GtkLabel" id="tar_xz_description_label">
|
|
|
8be0b6 |
- <property name="visible">True</property>
|
|
|
8be0b6 |
- <property name="label" translatable="yes">Smaller archives but Linux and Mac only.</property>
|
|
|
8be0b6 |
- <property name="xalign">0</property>
|
|
|
8be0b6 |
- <style>
|
|
|
8be0b6 |
- <class name="dim-label"/>
|
|
|
8be0b6 |
- </style>
|
|
|
8be0b6 |
- </object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="name">tar-xz-description-label</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
- </child>
|
|
|
8be0b6 |
+ <object class="GtkRevealer" id="error_revealer">
|
|
|
8be0b6 |
<child>
|
|
|
8be0b6 |
- <object class="GtkLabel" id="seven_zip_description_label">
|
|
|
8be0b6 |
+ <object class="GtkLabel" id="error_label">
|
|
|
8be0b6 |
+ <property name="margin_top">4</property>
|
|
|
8be0b6 |
+ <property name="margin_bottom">4</property>
|
|
|
8be0b6 |
<property name="visible">True</property>
|
|
|
8be0b6 |
- <property name="label" translatable="yes">Smaller archives but must be installed on Windows and Mac.</property>
|
|
|
8be0b6 |
<property name="xalign">0</property>
|
|
|
8be0b6 |
- <style>
|
|
|
8be0b6 |
- <class name="dim-label"/>
|
|
|
8be0b6 |
- </style>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
- <packing>
|
|
|
8be0b6 |
- <property name="name">seven-zip-description-label</property>
|
|
|
8be0b6 |
- </packing>
|
|
|
8be0b6 |
</child>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
<packing>
|
|
|
8be0b6 |
<property name="expand">False</property>
|
|
|
8be0b6 |
<property name="fill">True</property>
|
|
|
8be0b6 |
- <property name="position">5</property>
|
|
|
8be0b6 |
+ <property name="position">3</property>
|
|
|
8be0b6 |
</packing>
|
|
|
8be0b6 |
</child>
|
|
|
8be0b6 |
</object>
|
|
|
8be0b6 |
--
|
|
|
8be0b6 |
2.31.1
|
|
|
8be0b6 |
|