dasher r3428 - in trunk/Src/Win32: . Widgets



Author: pcowans
Date: Sun Feb 17 18:16:45 2008
New Revision: 3428
URL: http://svn.gnome.org/viewvc/dasher?rev=3428&view=rev

Log:
* Fixing various bugs.

Modified:
   trunk/Src/Win32/Dasher.rc
   trunk/Src/Win32/DasherWindow.cpp
   trunk/Src/Win32/Widgets/AdvancedPage.cpp
   trunk/Src/Win32/Widgets/Edit.cpp
   trunk/Src/Win32/Widgets/ViewPage.cpp
   trunk/Src/Win32/resource.h

Modified: trunk/Src/Win32/Dasher.rc
==============================================================================
--- trunk/Src/Win32/Dasher.rc	(original)
+++ trunk/Src/Win32/Dasher.rc	Sun Feb 17 18:16:45 2008
@@ -282,10 +282,10 @@
     CONTROL         "Show toolbar",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,30,58,10
     CONTROL         "Show speed control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,42,79,10
     CONTROL         "Timestamp new files",IDC_TIMESTAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,18,80,8
-    CONTROL         "Stand-alone",IDC_STYLE_STANDALONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,201,58,55,10
+    CONTROL         "Stand-alone",IDC_STYLE_STANDALONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,201,91,55,10
     CONTROL         "Composition",IDC_STYLE_COMPOSITION,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,319,221,55,10
-    CONTROL         "Direct entry",IDC_STYLE_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,201,70,54,10
-    GROUPBOX        "Application Style:",IDC_STATIC,194,48,180,35
+    CONTROL         "Direct entry",IDC_STYLE_DIRECT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,201,103,54,10
+    GROUPBOX        "Application Style:",IDC_STATIC,194,81,180,35
     CONTROL         "Full screen",IDC_STYLE_FULL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_TABSTOP,234,218,50,10
     GROUPBOX        "Application Options:",IDC_STATIC,7,7,180,64
     GROUPBOX        "Speech:",IDC_STATIC,194,7,180,39
@@ -293,6 +293,8 @@
     PUSHBUTTON      "Change Font",IDC_EFONT_BUTTON,14,84,166,14
     CONTROL         "Speak on stop",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,18,99,10
     CONTROL         "Speak on word breaks",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,29,90,10
+    GROUPBOX        "Clipboard:",IDC_STATIC,194,50,180,26
+    CONTROL         "Copy all on stop",IDC_COPYONSTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,61,90,10
 END
 
 
@@ -408,7 +410,7 @@
         MENUITEM "Save &As...",                 ID_FILE_SAVE_AS
         MENUITEM "&Append to File...",          ID_FILE_APPEND, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Import Training Text",       ID_IMPORT_TRAINFILE
+        MENUITEM "&Import Training Text...",    ID_IMPORT_TRAINFILE
         MENUITEM SEPARATOR
         MENUITEM "E&xit",                       IDM_EXIT
     END

Modified: trunk/Src/Win32/DasherWindow.cpp
==============================================================================
--- trunk/Src/Win32/DasherWindow.cpp	(original)
+++ trunk/Src/Win32/DasherWindow.cpp	Sun Feb 17 18:16:45 2008
@@ -421,9 +421,7 @@
       m_pEdit->SaveAs();
     return 0;
   case ID_IMPORT_TRAINFILE:
-    // TODO: Fix dummy arguments
-	  // Game temp comment for compiling
-    //m_pDasher->TrainFile(m_pEdit->Import(),0,0);
+    m_pDasher->ImportTrainingText(m_pEdit->Import());
     return 0;
   default:
     return DefWindowProc(message, wParam, lParam);

Modified: trunk/Src/Win32/Widgets/AdvancedPage.cpp
==============================================================================
--- trunk/Src/Win32/Widgets/AdvancedPage.cpp	(original)
+++ trunk/Src/Win32/Widgets/AdvancedPage.cpp	Sun Feb 17 18:16:45 2008
@@ -43,7 +43,8 @@
   {APP_BP_TIME_STAMP, IDC_TIMESTAMP},
   {BP_CONTROL_MODE, IDC_CONTROLMODE},  // Not global setting - specific to editbox/widget
   {APP_BP_SPEECH_WORD, IDC_CHECK4},
-  {APP_BP_SPEECH_MODE, IDC_CHECK3}
+  {APP_BP_SPEECH_MODE, IDC_CHECK3},
+  {APP_BP_COPY_ALL_ON_STOP, IDC_COPYONSTOP}
 };
 
 std::string CAdvancedPage::GetControlText(HWND Dialog, int ControlID) 

Modified: trunk/Src/Win32/Widgets/Edit.cpp
==============================================================================
--- trunk/Src/Win32/Widgets/Edit.cpp	(original)
+++ trunk/Src/Win32/Widgets/Edit.cpp	Sun Feb 17 18:16:45 2008
@@ -976,7 +976,7 @@
     break;
   case EV_EDIT_CONTEXT:
     // TODO: Make this return the context properly. cf Linux 
-    m_pDasherInterface->SetContext("");
+    //m_pDasherInterface->SetContext("");
     break;
   }
 }

Modified: trunk/Src/Win32/Widgets/ViewPage.cpp
==============================================================================
--- trunk/Src/Win32/Widgets/ViewPage.cpp	(original)
+++ trunk/Src/Win32/Widgets/ViewPage.cpp	Sun Feb 17 18:16:45 2008
@@ -129,6 +129,10 @@
         m_pDasherInterface->SetStringParameter(SP_COLOUR_ID, m_CurrentColours);
   }
 
+  m_pAppSettings->SetBoolParameter(BP_PALETTE_CHANGE, 
+    SendMessage(GetDlgItem(m_hwnd, IDC_COLOURSCHEME), BM_GETCHECK, 0, 0) == BST_UNCHECKED );
+
+
   if(SendMessage(GetDlgItem(m_hwnd, IDC_FONT_SMALL), BM_GETCHECK, 0, 0) == BST_CHECKED)
     m_pAppSettings->SetLongParameter(LP_DASHER_FONTSIZE, Dasher::Opts::Normal);
   else if(SendMessage(GetDlgItem(m_hwnd, IDC_FONT_LARGE), BM_GETCHECK, 0, 0) == BST_CHECKED)

Modified: trunk/Src/Win32/resource.h
==============================================================================
--- trunk/Src/Win32/resource.h	(original)
+++ trunk/Src/Win32/resource.h	Sun Feb 17 18:16:45 2008
@@ -108,6 +108,7 @@
 #define IDC_BUTTON_PREFS2               1019
 #define IDC_CLIPTOALPH_UNORDERED        1020
 #define IDC_THICKLINE                   1020
+#define IDC_COPYONSTOP                  1020
 #define IDC_LIST2                       1021
 #define IDC_LIST_GROUP                  1022
 #define IDC_CLIPTOALPH_ORDERED          1023



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]