From 8360df5e7b3f37d969fe9329b2cdff17510b7abc Mon Sep 17 00:00:00 2001 From: george82 Date: Tue, 29 Mar 2005 12:03:32 +0000 Subject: [PATCH] Removed the unnecessary option "Auto store player settings" from OptionsDialog dialog. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@276 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- rfbplayer/OptionsDialog.h | 3 --- rfbplayer/PlayerOptions.cxx | 3 --- rfbplayer/PlayerOptions.h | 2 -- rfbplayer/rfbplayer.rc | 22 ++++++++++------------ 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/rfbplayer/OptionsDialog.h b/rfbplayer/OptionsDialog.h index 9bf9bbc4..c31e3fbf 100644 --- a/rfbplayer/OptionsDialog.h +++ b/rfbplayer/OptionsDialog.h @@ -44,7 +44,6 @@ protected: SendMessage(combo, CB_SETCURSEL, options->pixelFormatIndex + 1, 0); setItemChecked(IDC_ACCEPT_BELL, options->acceptBell); setItemChecked(IDC_ACCEPT_CUT_TEXT, options->acceptCutText); - setItemChecked(IDC_AUTO_STORE_PARAM, options->autoStoreSettings); setItemChecked(IDC_AUTOPLAY, options->autoPlay); setItemChecked(IDC_BIG_ENDIAN, options->bigEndianFlag); if (options->askPixelFormat) { @@ -57,7 +56,6 @@ protected: options->askPixelFormat = isItemChecked(IDC_ASK_PF); options->acceptBell = isItemChecked(IDC_ACCEPT_BELL); options->acceptCutText = isItemChecked(IDC_ACCEPT_CUT_TEXT); - options->autoStoreSettings = isItemChecked(IDC_AUTO_STORE_PARAM); options->autoPlay = isItemChecked(IDC_AUTOPLAY); options->bigEndianFlag = isItemChecked(IDC_BIG_ENDIAN); if (!options->askPixelFormat) { @@ -84,7 +82,6 @@ protected: setItemChecked(IDC_ASK_PF, DEFAULT_ASK_PF); setItemChecked(IDC_ACCEPT_BELL, DEFAULT_ACCEPT_BELL); setItemChecked(IDC_ACCEPT_CUT_TEXT, DEFAULT_ACCEPT_CUT_TEXT); - setItemChecked(IDC_AUTO_STORE_PARAM, DEFAULT_STORE_SETTINGS); setItemChecked(IDC_AUTOPLAY, DEFAULT_AUTOPLAY); setItemChecked(IDC_BIG_ENDIAN, DEFAULT_BIG_ENDIAN); } diff --git a/rfbplayer/PlayerOptions.cxx b/rfbplayer/PlayerOptions.cxx index 189401f8..8bf8ff24 100644 --- a/rfbplayer/PlayerOptions.cxx +++ b/rfbplayer/PlayerOptions.cxx @@ -41,7 +41,6 @@ void PlayerOptions::readFromRegistry() { setPF(pPF); acceptBell = regKey.getBool(_T("AcceptBell"), DEFAULT_ACCEPT_BELL); acceptCutText = regKey.getBool(_T("AcceptCutText"), DEFAULT_ACCEPT_CUT_TEXT); - autoStoreSettings = regKey.getBool(_T("AutoStoreSettings"), DEFAULT_STORE_SETTINGS); autoPlay = regKey.getBool(_T("AutoPlay"), DEFAULT_AUTOPLAY); loopPlayback = regKey.getBool(_T("LoopPlayback"), DEFAULT_LOOP_PLAYBACK); askPixelFormat = regKey.getBool(_T("AskPixelFormat"), DEFAULT_ASK_PF); @@ -62,7 +61,6 @@ void PlayerOptions::writeToRegistry() { regKey.setBinary(_T("PixelFormat"), &pixelFormat, sizeof(PixelFormat)); regKey.setBool(_T("AcceptBell"), acceptBell); regKey.setBool(_T("AcceptCutText"), acceptCutText); - regKey.setBool(_T("AutoStoreSettings"), autoStoreSettings); regKey.setBool(_T("AutoPlay"), autoPlay); regKey.setBool(_T("LoopPlayback"), loopPlayback); regKey.setBool(_T("AskPixelFormat"), askPixelFormat); @@ -85,7 +83,6 @@ void PlayerOptions::writeDefaults() { acceptCutText = DEFAULT_ACCEPT_CUT_TEXT; loopPlayback = DEFAULT_LOOP_PLAYBACK; askPixelFormat = DEFAULT_ASK_PF; - autoStoreSettings = DEFAULT_STORE_SETTINGS; commandLineParam = false; } diff --git a/rfbplayer/PlayerOptions.h b/rfbplayer/PlayerOptions.h index 14e61401..ad361740 100644 --- a/rfbplayer/PlayerOptions.h +++ b/rfbplayer/PlayerOptions.h @@ -51,7 +51,6 @@ #define DEFAULT_ASK_PF FALSE #define DEFAULT_AUTOPLAY FALSE #define DEFAULT_FULL_SCREEN FALSE -#define DEFAULT_STORE_SETTINGS FALSE using namespace rfb; @@ -76,6 +75,5 @@ public: bool loopPlayback; bool askPixelFormat; long frameScale; - bool autoStoreSettings; bool commandLineParam; }; \ No newline at end of file diff --git a/rfbplayer/rfbplayer.rc b/rfbplayer/rfbplayer.rc index f3f84609..6eb83754 100644 --- a/rfbplayer/rfbplayer.rc +++ b/rfbplayer/rfbplayer.rc @@ -225,7 +225,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,7,40,63,12 END -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 187, 194 +IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 187, 180 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Sans Serif" @@ -240,20 +240,17 @@ BEGIN BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,15,105,157,15 CONTROL "Accept the cut text",IDC_ACCEPT_CUT_TEXT,"Button", BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,15,120,157,15 - CONTROL "Auto store the player settings",IDC_AUTO_STORE_PARAM, - "Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,15,135, - 157,15 CONTROL "Start play the session when it is opened",IDC_AUTOPLAY, - "Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,15,150, + "Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,15,135, 157,9 - DEFPUSHBUTTON "OK",IDOK,20,174,50,14 - PUSHBUTTON "Cancel",IDCANCEL,75,174,50,14 - PUSHBUTTON "Default",IDC_DEFAULT,130,174,50,14 + DEFPUSHBUTTON "OK",IDOK,20,161,50,13 + PUSHBUTTON "Cancel",IDCANCEL,75,161,50,13 + PUSHBUTTON "Default",IDC_DEFAULT,130,161,50,13 PUSHBUTTON "Edit User PF",IDC_EDIT_UPF,110,52,62,14 GROUPBOX "Pixel format",IDC_STATIC,7,6,173,79 LTEXT "Forces the pixel format for the rfb session:", IDC_STATIC,15,17,157,13 - GROUPBOX "Other",IDC_STATIC,7,90,173,79 + GROUPBOX "Other",IDC_STATIC,7,90,173,65 END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 251, 95 @@ -382,7 +379,7 @@ BEGIN VERTGUIDE, 130 VERTGUIDE, 172 TOPMARGIN, 6 - BOTTOMMARGIN, 188 + BOTTOMMARGIN, 174 HORZGUIDE, 17 HORZGUIDE, 30 HORZGUIDE, 42 @@ -393,9 +390,10 @@ BEGIN HORZGUIDE, 105 HORZGUIDE, 120 HORZGUIDE, 135 + HORZGUIDE, 144 HORZGUIDE, 150 - HORZGUIDE, 169 - HORZGUIDE, 174 + HORZGUIDE, 155 + HORZGUIDE, 161 END IDD_USERPF_LIST, DIALOG -- 2.39.5