GNOME.org
 

[dasher] g/c unsused docking parameters.

commit 35655eb5daeb66d0a6f535193614841f2a769ca0
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Mon Apr 11 19:53:31 2011 +0200

    g/c unsused docking parameters.

 Data/GUI/dasher.preferences.ui        |   16 ----------------
 Src/Common/AppSettingsData.h          |    3 ---
 Src/Common/AppSettingsHeader.h        |    4 ++--
 Src/Gtk2/Preferences.cpp              |    1 -
 Src/Gtk2/dasher_main.cpp              |    5 -----
 Src/Installer/Dasher.wxs              |    3 ---
 Src/InstallerTobii/InstallerTobii.wxs |    3 ---
 Src/InstallerW2K/InstallerW2K.wxs     |    3 ---
 8 files changed, 2 insertions(+), 36 deletions(-)
---
diff --git a/Data/GUI/dasher.preferences.ui b/Data/GUI/dasher.preferences.ui
index c5214e0..dea6b2a 100644
--- a/Data/GUI/dasher.preferences.ui
+++ b/Data/GUI/dasher.preferences.ui
@@ -1486,22 +1486,6 @@ your writing speed.</property>
                                             <property name="position">3</property>
                                           </packing>
                                         </child>
-                                        <child>
-                                          <object class="GtkCheckButton" id="dockbutton">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="border_width">2</property>
-                                            <property name="label" translatable="yes">Dock application window</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="draw_indicator">True</property>
-                                            <signal handler="generic_bool_changed" name="clicked"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">4</property>
-                                          </packing>
-                                        </child>
                                       </object>
                                     </child>
                                   </object>
diff --git a/Src/Common/AppSettingsData.h b/Src/Common/AppSettingsData.h
index 0ecc354..e159871 100644
--- a/Src/Common/AppSettingsData.h
+++ b/Src/Common/AppSettingsData.h
@@ -61,7 +61,6 @@ app_bp_table app_boolparamtable[] = {
   {APP_BP_WINDOW_PAUSE, "PauseOutsideWindow", PERS, false, false, "PauseOutsideWindow"},
   {APP_BP_SPEECH_MODE, "SpeechEnabled", PERS, false, false, "Speak on stop"},
   {APP_BP_KEYBOARD_MODE, "KeyboardMode", PERS, false, false, "KeyboardMode"},
-  {APP_BP_DOCK, "Dock", PERS, false, false, "Dock main window"},
   {APP_BP_SPEECH_WORD, "SpeechWord", PERS, false, false, "Speak on word boundaries"}
 };
 
@@ -75,8 +74,6 @@ app_lp_table app_longparamtable[] = {
   {APP_LP_SCREEN_WIDTH_H, "ScreenWidthH", PERS, 625, 625, "Screen Width for application style compose"},
   {APP_LP_SCREEN_HEIGHT_H, "ScreenHeightH", PERS, 250, 250, "Screen Height for application style compose"},
   {APP_LP_STYLE, "AppStyle", PERS, 0, 0, "Application style"},
-  {APP_LP_DOCK_STYLE, "DockStyle", PERS, 4, 4, "Dock Style, 0-3 = docked, 4 = floating, 5 = fullscreen"},
-  {APP_LP_DOCK_POSITION, "DockPosition", PERS, 100, 100, "Dock Position"},
   {APP_LP_X, "XPosition", PERS, 100, 100, "X location of window"},
   {APP_LP_Y, "YPosition", PERS, 100, 100, "Y location of window"},
 #ifdef WITH_MAEMO
diff --git a/Src/Common/AppSettingsHeader.h b/Src/Common/AppSettingsHeader.h
index 7b175c7..fede1dc 100644
--- a/Src/Common/AppSettingsHeader.h
+++ b/Src/Common/AppSettingsHeader.h
@@ -10,14 +10,14 @@ enum {
   APP_BP_TIME_STAMP = END_OF_SPS, APP_BP_SHOW_TOOLBAR,
   APP_BP_SHOW_TOOLBAR_TEXT, APP_BP_SHOW_LARGE_ICONS, APP_BP_FIX_LAYOUT,
   APP_BP_COPY_ALL_ON_STOP,APP_BP_WINDOW_PAUSE, APP_BP_SPEECH_MODE, 
-  APP_BP_KEYBOARD_MODE, APP_BP_DOCK, APP_BP_SPEECH_WORD, END_OF_APP_BPS
+  APP_BP_KEYBOARD_MODE, APP_BP_SPEECH_WORD, END_OF_APP_BPS
 };
 
 enum { 
   APP_LP_FILE_ENCODING = END_OF_APP_BPS, APP_LP_EDIT_FONT_SIZE, APP_LP_EDIT_HEIGHT,
   APP_LP_EDIT_WIDTH, 
   APP_LP_SCREEN_WIDTH, APP_LP_SCREEN_HEIGHT, APP_LP_SCREEN_WIDTH_H, APP_LP_SCREEN_HEIGHT_H, 
-  APP_LP_STYLE, APP_LP_DOCK_STYLE, APP_LP_DOCK_POSITION, APP_LP_X, APP_LP_Y,
+  APP_LP_STYLE, APP_LP_X, APP_LP_Y,
 #ifdef WITH_MAEMO
   APP_LP_MAEMO_SIZE,
 #endif
diff --git a/Src/Gtk2/Preferences.cpp b/Src/Gtk2/Preferences.cpp
index 73d577a..c3cae4b 100644
--- a/Src/Gtk2/Preferences.cpp
+++ b/Src/Gtk2/Preferences.cpp
@@ -42,7 +42,6 @@ BoolTranslation sBoolTranslationTable[] = {
   {APP_BP_SHOW_TOOLBAR, "toolbarbutton", NULL},
   {BP_CONTROL_MODE, "control_controlmode", NULL},
   {APP_BP_TIME_STAMP, "timestampbutton", NULL},
-  {APP_BP_DOCK, "dockbutton", NULL},
   {BP_START_MOUSE, "leftbutton", NULL},  
   {BP_START_SPACE, "spacebutton", NULL},
   {BP_STOP_OUTSIDE, "winpausebutton", NULL},
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index c23404f..0f020fc 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -696,9 +696,6 @@ dasher_main_load_state(DasherMain *pSelf) {
   iWindowY = dasher_app_settings_get_long(pPrivate->pAppSettings, APP_LP_Y);
 
   gtk_window_move(GTK_WINDOW(pPrivate->pMainWindow), iWindowX, iWindowY);
-
-  
-  //  pPrivate->iPosition = dasher_app_settings_get_long(pPrivate->pAppSettings, APP_LP_DOCK_POSITION);
 }
 
 static void 
@@ -734,8 +731,6 @@ dasher_main_save_state(DasherMain *pSelf) {
 
    dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_X, iWindowX);
    dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_Y, iWindowY);
-
-   //   dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_DOCK_POSITION, pPrivate->iPosition);
 }
 
 void 
diff --git a/Src/Installer/Dasher.wxs b/Src/Installer/Dasher.wxs
index bdcf04c..115d340 100644
--- a/Src/Installer/Dasher.wxs
+++ b/Src/Installer/Dasher.wxs
@@ -310,7 +310,6 @@
 	<Registry Id="RegistryPauseOutsideWindow" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="PauseOutsideWindow" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistrySpeechEnabled" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="SpeechEnabled" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistryKeyboardMode" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="KeyboardMode" Action="write" Type="integer" Value="0" />
-	<Registry Id="RegistryDock" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Dock" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistryScreenOrientation" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenOrientation" Action="write" Type="integer" Value="-2" />
 	<Registry Id="RegistryMaxBitRateTimes100" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="MaxBitRateTimes100" Action="write" Type="integer" Value="80" />
 	<Registry Id="RegistryViewID" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ViewID" Action="write" Type="integer" Value="1" />
@@ -363,8 +362,6 @@
 	<Registry Id="RegistryScreenWidthH" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenWidthH" Action="write" Type="integer" Value="625" />
 	<Registry Id="RegistryScreenHeightH" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenHeightH" Action="write" Type="integer" Value="250" />
 	<Registry Id="RegistryAppStyle" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="AppStyle" Action="write" Type="integer" Value="0" />
-	<Registry Id="RegistryDockStyle" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DockStyle" Action="write" Type="integer" Value="4" />
-	<Registry Id="RegistryDockPosition" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DockPosition" Action="write" Type="integer" Value="100" />
 	<Registry Id="RegistryAlphabetID" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="AlphabetID" Action="write" Type="string" Value="" />
 	<Registry Id="RegistryAlphabet1" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Alphabet1" Action="write" Type="string" Value="" />
 	<Registry Id="RegistryAlphabet2" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Alphabet2" Action="write" Type="string" Value="" />
diff --git a/Src/InstallerTobii/InstallerTobii.wxs b/Src/InstallerTobii/InstallerTobii.wxs
index 031f758..ccb4064 100644
--- a/Src/InstallerTobii/InstallerTobii.wxs
+++ b/Src/InstallerTobii/InstallerTobii.wxs
@@ -304,7 +304,6 @@
 	<Registry Id="RegistryPauseOutsideWindow" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="PauseOutsideWindow" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistrySpeechEnabled" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="SpeechEnabled" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistryKeyboardMode" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="KeyboardMode" Action="write" Type="integer" Value="0" />
-	<Registry Id="RegistryDock" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Dock" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistryScreenOrientation" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenOrientation" Action="write" Type="integer" Value="-2" />
 	<Registry Id="RegistryMaxBitRateTimes100" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="MaxBitRateTimes100" Action="write" Type="integer" Value="80" />
 	<Registry Id="RegistryViewID" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ViewID" Action="write" Type="integer" Value="1" />
@@ -357,8 +356,6 @@
 	<Registry Id="RegistryScreenWidthH" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenWidthH" Action="write" Type="integer" Value="625" />
 	<Registry Id="RegistryScreenHeightH" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenHeightH" Action="write" Type="integer" Value="250" />
 	<Registry Id="RegistryAppStyle" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="AppStyle" Action="write" Type="integer" Value="0" />
-	<Registry Id="RegistryDockStyle" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DockStyle" Action="write" Type="integer" Value="4" />
-	<Registry Id="RegistryDockPosition" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DockPosition" Action="write" Type="integer" Value="100" />
 	<Registry Id="RegistryAlphabetID" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="AlphabetID" Action="write" Type="string" Value="" />
 	<Registry Id="RegistryAlphabet1" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Alphabet1" Action="write" Type="string" Value="" />
 	<Registry Id="RegistryAlphabet2" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Alphabet2" Action="write" Type="string" Value="" />
diff --git a/Src/InstallerW2K/InstallerW2K.wxs b/Src/InstallerW2K/InstallerW2K.wxs
index fa45cd1..8331ffb 100644
--- a/Src/InstallerW2K/InstallerW2K.wxs
+++ b/Src/InstallerW2K/InstallerW2K.wxs
@@ -304,7 +304,6 @@
 	<Registry Id="RegistryPauseOutsideWindow" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="PauseOutsideWindow" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistrySpeechEnabled" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="SpeechEnabled" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistryKeyboardMode" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="KeyboardMode" Action="write" Type="integer" Value="0" />
-	<Registry Id="RegistryDock" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Dock" Action="write" Type="integer" Value="0" />
 	<Registry Id="RegistryScreenOrientation" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenOrientation" Action="write" Type="integer" Value="-2" />
 	<Registry Id="RegistryMaxBitRateTimes100" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="MaxBitRateTimes100" Action="write" Type="integer" Value="80" />
 	<Registry Id="RegistryViewID" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ViewID" Action="write" Type="integer" Value="1" />
@@ -357,8 +356,6 @@
 	<Registry Id="RegistryScreenWidthH" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenWidthH" Action="write" Type="integer" Value="625" />
 	<Registry Id="RegistryScreenHeightH" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="ScreenHeightH" Action="write" Type="integer" Value="250" />
 	<Registry Id="RegistryAppStyle" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="AppStyle" Action="write" Type="integer" Value="0" />
-	<Registry Id="RegistryDockStyle" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DockStyle" Action="write" Type="integer" Value="4" />
-	<Registry Id="RegistryDockPosition" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="DockPosition" Action="write" Type="integer" Value="100" />
 	<Registry Id="RegistryAlphabetID" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="AlphabetID" Action="write" Type="string" Value="" />
 	<Registry Id="RegistryAlphabet1" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Alphabet1" Action="write" Type="string" Value="" />
 	<Registry Id="RegistryAlphabet2" Root="HKCU" Key="Software\Inference Group\Dasher3" Name="Alphabet2" Action="write" Type="string" Value="" />
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]