[easytag/wip/gsettings: 21/24] Remove message box location settings
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/gsettings: 21/24] Remove message box location settings
- Date: Mon, 4 Mar 2013 23:16:52 +0000 (UTC)
commit ee5b266ad49047d41892a6c295a8fb5aa56279e7
Author: David King <amigadave amigadave com>
Date: Sun Mar 3 17:50:54 2013 +0000
Remove message box location settings
In all cases the message box dialog was set as transient for the main
window.
src/picture.c | 24 ------------------------
src/prefs.c | 44 --------------------------------------------
src/setting.c | 15 ---------------
src/setting.h | 5 -----
4 files changed, 0 insertions(+), 88 deletions(-)
---
diff --git a/src/picture.c b/src/picture.c
index 68db119..23d5f28 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -294,14 +294,6 @@ void Picture_Add_Button_Clicked (GObject *object)
// Make this filter the default
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
- // Set window position
- if (MESSAGE_BOX_POSITION_NONE)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_NONE);
- else if (MESSAGE_BOX_POSITION_CENTER)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_CENTER);
- else if (MESSAGE_BOX_POSITION_MOUSE)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_MOUSE);
-
// Behaviour following the tag type...
switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
{
@@ -409,14 +401,6 @@ void Picture_Properties_Button_Clicked (GObject *object)
NULL);
g_free(title);
- // Set window position
- if (MESSAGE_BOX_POSITION_NONE)
- gtk_window_set_position(GTK_WINDOW(PictureTypesWindow),GTK_WIN_POS_NONE);
- else if (MESSAGE_BOX_POSITION_CENTER)
- gtk_window_set_position(GTK_WINDOW(PictureTypesWindow),GTK_WIN_POS_CENTER);
- else if (MESSAGE_BOX_POSITION_MOUSE)
- gtk_window_set_position(GTK_WINDOW(PictureTypesWindow),GTK_WIN_POS_MOUSE);
-
gtk_dialog_set_default_response(GTK_DIALOG(PictureTypesWindow), GTK_RESPONSE_OK);
ScrollWindowPictureTypes = gtk_scrolled_window_new(NULL, NULL);
@@ -630,14 +614,6 @@ void Picture_Save_Button_Clicked (GObject *object)
// Make this filter the default
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
- // Set window position
- if (MESSAGE_BOX_POSITION_NONE)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_NONE);
- else if (MESSAGE_BOX_POSITION_CENTER)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_CENTER);
- else if (MESSAGE_BOX_POSITION_MOUSE)
- gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_MOUSE);
-
gtk_dialog_set_default_response(GTK_DIALOG(FileSelectionWindow), GTK_RESPONSE_OK);
// Set the default folder if defined
diff --git a/src/prefs.c b/src/prefs.c
index 7800bc6..1fc65a6 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -340,50 +340,6 @@ void Open_OptionsWindow (void)
gtk_widget_set_tooltip_text(SortingFileCaseSensitive,_("If activated, the "
"sorting of the list will be dependent on the case."));
- /* Message Dialog Position */
- Frame = gtk_frame_new (_("Message Dialog Position"));
- gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
- Table = et_grid_new (2, 2);
- gtk_container_add(GTK_CONTAINER(Frame),Table);
- /*gtk_grid_set_row_spacing (GTK_GRID (Table), 2);*/
- gtk_grid_set_column_spacing (GTK_GRID (Table), 4);
-
-
- MessageBoxPositionNone = gtk_radio_button_new_with_label(NULL,_("No particular position"));
- gtk_grid_attach (GTK_GRID (Table), MessageBoxPositionNone, 0, 0, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MessageBoxPositionNone),
- MESSAGE_BOX_POSITION_NONE);
- gtk_widget_set_tooltip_text(MessageBoxPositionNone,_("Let the Window Manager "
- "to place the windows."));
-
- MessageBoxPositionCenterOnParent = gtk_radio_button_new_with_label(
- gtk_radio_button_get_group(GTK_RADIO_BUTTON(MessageBoxPositionNone)),
- _("Center of the main window"));
- gtk_grid_attach (GTK_GRID (Table), MessageBoxPositionCenterOnParent, 1, 0,
- 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MessageBoxPositionCenterOnParent),
- MESSAGE_BOX_POSITION_CENTER_ON_PARENT);
- gtk_widget_set_tooltip_text(MessageBoxPositionCenterOnParent,_("Windows should "
- "be placed in the center of the main window."));
-
- MessageBoxPositionCenter = gtk_radio_button_new_with_label(
- gtk_radio_button_get_group(GTK_RADIO_BUTTON(MessageBoxPositionNone)),
- _("Center of the screen"));
- gtk_grid_attach (GTK_GRID (Table), MessageBoxPositionCenter, 0, 1, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MessageBoxPositionCenter),
- MESSAGE_BOX_POSITION_CENTER);
- gtk_widget_set_tooltip_text(MessageBoxPositionCenter,_("Windows should be placed "
- "in the center of the screen."));
-
- MessageBoxPositionMouse = gtk_radio_button_new_with_label(
- gtk_radio_button_get_group(GTK_RADIO_BUTTON(MessageBoxPositionNone)),
- _("Mouse position"));
- gtk_grid_attach (GTK_GRID (Table), MessageBoxPositionMouse, 1, 1, 1, 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MessageBoxPositionMouse),
- MESSAGE_BOX_POSITION_MOUSE);
- gtk_widget_set_tooltip_text(MessageBoxPositionMouse,_("Windows should be placed "
- "at the current mouse position."));
-
/* File Player */
Frame = gtk_frame_new (_("File Audio Player"));
gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
diff --git a/src/setting.c b/src/setting.c
index 345dd12..88dcf5a 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -133,11 +133,6 @@ tConfigVariable Config_Variables[] =
{"file_writing_id3v1_iconv_options_translit", CV_TYPE_BOOL,
&FILE_WRITING_ID3V1_ICONV_OPTIONS_TRANSLIT},
{"file_writing_id3v1_iconv_options_ignore", CV_TYPE_BOOL,
&FILE_WRITING_ID3V1_ICONV_OPTIONS_IGNORE},
- {"message_box_position_none", CV_TYPE_BOOL, &MESSAGE_BOX_POSITION_NONE },
- {"message_box_position_center", CV_TYPE_BOOL, &MESSAGE_BOX_POSITION_CENTER },
- {"message_box_position_mouse", CV_TYPE_BOOL, &MESSAGE_BOX_POSITION_MOUSE },
- {"message_box_position_center_on_parent", CV_TYPE_BOOL, &MESSAGE_BOX_POSITION_CENTER_ON_PARENT },
-
{"audio_file_player", CV_TYPE_STRING,&AUDIO_FILE_PLAYER },
{"scanner_type", CV_TYPE_INT, &SCANNER_TYPE },
@@ -236,11 +231,6 @@ void Init_Config_Variables (void)
SORTING_FILE_CASE_SENSITIVE = 0;
#endif /* !G_OS_WIN32 */
- MESSAGE_BOX_POSITION_NONE = 0;
- MESSAGE_BOX_POSITION_CENTER = 0;
- MESSAGE_BOX_POSITION_MOUSE = 0;
- MESSAGE_BOX_POSITION_CENTER_ON_PARENT = 1;
-
#ifdef G_OS_WIN32
AUDIO_FILE_PLAYER = ET_Win32_Get_Audio_File_Player();
#else /* !G_OS_WIN32 */
@@ -387,11 +377,6 @@ Apply_Changes_Of_Preferences_Window (void)
SORTING_FILE_MODE = gtk_combo_box_get_active(GTK_COMBO_BOX(SortingFileCombo));
- MESSAGE_BOX_POSITION_NONE =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(MessageBoxPositionNone));
- MESSAGE_BOX_POSITION_CENTER =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(MessageBoxPositionCenter));
- MESSAGE_BOX_POSITION_MOUSE =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(MessageBoxPositionMouse));
- MESSAGE_BOX_POSITION_CENTER_ON_PARENT =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(MessageBoxPositionCenterOnParent));
-
if (AUDIO_FILE_PLAYER) g_free(AUDIO_FILE_PLAYER);
AUDIO_FILE_PLAYER =
g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(FilePlayerCombo)))));
diff --git a/src/setting.h b/src/setting.h
index 7e7345e..a19e2ee 100644
--- a/src/setting.h
+++ b/src/setting.h
@@ -58,11 +58,6 @@ gchar *DEFAULT_PATH_TO_MP3;
gint SORTING_FILE_MODE;
gint SORTING_FILE_CASE_SENSITIVE;
-gint MESSAGE_BOX_POSITION_NONE;
-gint MESSAGE_BOX_POSITION_CENTER;
-gint MESSAGE_BOX_POSITION_MOUSE;
-gint MESSAGE_BOX_POSITION_CENTER_ON_PARENT;
-
gchar *AUDIO_FILE_PLAYER;
/* File Settings */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]