[Xfce4-commits] <xfce4-screenshooter:master> Always show the save dialog when we save a screenshot.
Jérôme Guelfucci
jeromeg at xfce.org
Fri Aug 14 00:26:08 CEST 2009
Updating branch refs/heads/master
to 8e59b71a19516f17d09dddb279b766df0b548746 (commit)
from 93e5c70eddeea7d19ac198790d5f8058da8ff3b3 (commit)
commit 8e59b71a19516f17d09dddb279b766df0b548746
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date: Sun Aug 2 19:05:34 2009 +0200
Always show the save dialog when we save a screenshot.
lib/screenshooter-actions.c | 2 +-
lib/screenshooter-dialogs.c | 75 +-----------------------------------------
lib/screenshooter-utils.c | 4 --
src/main.c | 10 ------
4 files changed, 3 insertions(+), 88 deletions(-)
diff --git a/lib/screenshooter-actions.c b/lib/screenshooter-actions.c
index 4bcab6c..744fe4a 100644
--- a/lib/screenshooter-actions.c
+++ b/lib/screenshooter-actions.c
@@ -40,7 +40,7 @@ gboolean screenshooter_take_and_output_screenshot (ScreenshotData *sd)
sd->screenshot_dir = screenshooter_get_home_uri ();
screenshooter_save_screenshot (screenshot,
- sd->show_save_dialog,
+ TRUE,
sd->screenshot_dir);
}
else if (sd->action == CLIPBOARD)
diff --git a/lib/screenshooter-dialogs.c b/lib/screenshooter-dialogs.c
index 71fa5ff..868e72a 100644
--- a/lib/screenshooter-dialogs.c
+++ b/lib/screenshooter-dialogs.c
@@ -54,9 +54,6 @@ static void
cb_zimagez_toggled (GtkToggleButton *tb,
ScreenshotData *sd);
static void
-cb_show_save_dialog_toggled (GtkToggleButton *tb,
- ScreenshotData *sd);
-static void
cb_default_folder (GtkWidget *chooser,
ScreenshotData *sd);
static void
@@ -210,14 +207,6 @@ static void cb_zimagez_toggled (GtkToggleButton *tb, ScreenshotData *sd)
-/* Set sd->show_save_dialog when the button is toggled */
-static void cb_show_save_dialog_toggled (GtkToggleButton *tb, ScreenshotData *sd)
-{
- gtk_toggle_button_get_active (tb) ? (sd->show_save_dialog = 1) : (sd->show_save_dialog = 0);
-}
-
-
-
/* Set sd->screenshot_dir when the user changed the value in the file chooser */
static void cb_default_folder (GtkWidget *chooser, ScreenshotData *sd)
{
@@ -677,9 +666,6 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
GtkWidget *delay_main_box, *delay_box, *delay_label, *delay_alignment;
GtkWidget *delay_spinner_box, *delay_spinner, *seconds_label;
- GtkWidget *options_main_box, *options_label, *options_alignment, *options_box;
- GtkWidget *save_checkbox;
-
GtkWidget *actions_main_box, *actions_label, *actions_alignment;
GtkWidget *save_radio_button, *dir_chooser;
GtkWidget *clipboard_radio_button, *open_with_radio_button;
@@ -831,7 +817,7 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
/* Rectangle */
rectangle_button =
gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (fullscreen_button),
- _("Select a region"));
+ _("Select a region"));
gtk_box_pack_start (GTK_BOX (area_box),
rectangle_button, FALSE,
@@ -844,7 +830,7 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
_("Select a region to be captured by clicking a point of "
"the screen without releasing the mouse button, "
"dragging your mouse to the other corner of the region, "
- "and releasing the mouse button."));
+ "and releasing the mouse button."));
g_signal_connect (G_OBJECT (rectangle_button), "toggled",
G_CALLBACK (cb_rectangle_toggled), sd);
@@ -942,56 +928,6 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
/* Set the default state */
cb_toggle_set_insensi (GTK_TOGGLE_BUTTON (rectangle_button), delay_box);
- /* Create the options box */
- options_main_box = gtk_vbox_new (FALSE, 6);
-
- gtk_widget_show (options_main_box);
-
- gtk_table_attach_defaults (GTK_TABLE (capture_table), options_main_box, 1, 2, 1, 2);
-
- /* Create the options label */
- options_label = gtk_label_new ("");
-
- gtk_label_set_markup (GTK_LABEL(options_label),
- _("<span weight=\"bold\" stretch=\"semiexpanded\">After "
- "capturing</span>"));
-
- gtk_misc_set_alignment(GTK_MISC (options_label), 0, 0);
- gtk_widget_show (options_label);
- gtk_box_pack_start (GTK_BOX (options_main_box), options_label, FALSE, FALSE, 0);
-
- /* Create options alignment */
- options_alignment = gtk_alignment_new (0, 0, 1, 1);
-
- gtk_container_add (GTK_CONTAINER (options_main_box), options_alignment);
-
- gtk_alignment_set_padding (GTK_ALIGNMENT (options_alignment), 0, 6, 12, 0);
-
- gtk_widget_show (options_alignment);
-
- /* Create the options box to be stored in the options alignment*/
- options_box = gtk_vbox_new (FALSE, 6);
- gtk_container_add (GTK_CONTAINER (options_alignment), options_box);
- gtk_container_set_border_width (GTK_CONTAINER (options_box), 0);
- gtk_widget_show (options_box);
-
- /* Display the save dialog checkbox */
- save_checkbox = gtk_check_button_new_with_label (_("Show the save dialog"));
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (save_checkbox),
- (sd->show_save_dialog == 1));
-
- gtk_widget_set_tooltip_text (save_checkbox,
- _("The save dialog allows you to change the file name "
- "and the save location"));
-
- gtk_box_pack_start (GTK_BOX (options_box), save_checkbox, FALSE, FALSE, 0);
-
- gtk_widget_show (save_checkbox);
-
- g_signal_connect (G_OBJECT (save_checkbox), "toggled",
- G_CALLBACK (cb_show_save_dialog_toggled), sd);
-
/* Create the actions main box */
actions_main_box = gtk_vbox_new (FALSE, 6);
@@ -1042,13 +978,6 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
gtk_table_attach_defaults (GTK_TABLE (actions_table), save_radio_button, 0, 1, 0, 1);
- /* Set the state of the save checkbox */
- gtk_widget_set_sensitive (GTK_WIDGET (save_checkbox),
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_radio_button)));
-
- g_signal_connect (G_OBJECT (save_radio_button), "toggled",
- G_CALLBACK (cb_toggle_set_sensi), save_checkbox);
-
/* Directory chooser */
dir_chooser =
gtk_file_chooser_button_new (_("Default save location"),
diff --git a/lib/screenshooter-utils.c b/lib/screenshooter-utils.c
index 8872b7c..b88be25 100644
--- a/lib/screenshooter-utils.c
+++ b/lib/screenshooter-utils.c
@@ -60,7 +60,6 @@ screenshooter_read_rc_file (const gchar *file, ScreenshotData *sd)
gint delay = 0;
gint region = FULLSCREEN;
gint action = SAVE;
- gint show_save_dialog = 1;
gint show_mouse = 1;
gchar *screenshot_dir = g_strdup (home_uri);
gchar *app = g_strdup ("none");
@@ -79,7 +78,6 @@ screenshooter_read_rc_file (const gchar *file, ScreenshotData *sd)
delay = xfce_rc_read_int_entry (rc, "delay", 0);
region = xfce_rc_read_int_entry (rc, "region", FULLSCREEN);
action = xfce_rc_read_int_entry (rc, "action", SAVE);
- show_save_dialog = xfce_rc_read_int_entry (rc, "show_save_dialog", 1);
show_mouse = xfce_rc_read_int_entry (rc, "show_mouse", 1);
g_free (app);
@@ -104,7 +102,6 @@ screenshooter_read_rc_file (const gchar *file, ScreenshotData *sd)
sd->delay = delay;
sd->region = region;
sd->action = action;
- sd->show_save_dialog = show_save_dialog;
sd->show_mouse = show_mouse;
sd->screenshot_dir = screenshot_dir;
sd->app = app;
@@ -135,7 +132,6 @@ screenshooter_write_rc_file (const gchar *file, ScreenshotData *sd)
xfce_rc_write_int_entry (rc, "delay", sd->delay);
xfce_rc_write_int_entry (rc, "region", sd->region);
xfce_rc_write_int_entry (rc, "action", sd->action);
- xfce_rc_write_int_entry (rc, "show_save_dialog", sd->show_save_dialog);
xfce_rc_write_int_entry (rc, "show_mouse", sd->show_mouse);
xfce_rc_write_entry (rc, "screenshot_dir", sd->screenshot_dir);
xfce_rc_write_entry (rc, "app", sd->app);
diff --git a/src/main.c b/src/main.c
index 7da37bc..a05c397 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,7 +32,6 @@ gboolean version = FALSE;
gboolean window = FALSE;
gboolean region = FALSE;
gboolean fullscreen = FALSE;
-gboolean no_save_dialog = FALSE;
gboolean hide_mouse = FALSE;
gboolean upload = FALSE;
gchar *screenshot_dir;
@@ -55,11 +54,6 @@ static GOptionEntry entries[] =
NULL
},
{
- "hide", 'h', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_save_dialog,
- N_("Do not display the save dialog"),
- NULL
- },
- {
"mouse", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &hide_mouse,
N_("Do not display the mouse on the screenshot"),
NULL
@@ -211,10 +205,6 @@ int main (int argc, char **argv)
sd->region = SELECT;
}
- /* Wether to show the save dialog allowing to choose a filename
- * and a save location */
- no_save_dialog ? (sd->show_save_dialog = 0) : (sd->show_save_dialog = 1);
-
/* Whether to display the mouse pointer on the screenshot */
hide_mouse ? (sd->show_mouse = 0) : (sd->show_mouse = 1);
More information about the Xfce4-commits
mailing list