Skip to content

Commit

Permalink
Checkbox for disabling status message added (win32)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rdanbrook
rdanbrook committed Mar 29, 2013
1 parent 26e66bf commit 63ec240
Show file tree
Hide file tree
Showing 6 changed files with 459 additions and 446 deletions.
5 changes: 5 additions & 0 deletions source/win32/NstDialogPreferences.cpp
View file
Expand Up @@ -308,6 +308,7 @@ namespace Nestopia
}

settings.alwaysAskSystem = application[ "favored-system-always-ask" ].Yes();
settings.disableStatusMsg = application[ "disable-statusmsg" ].Yes();
}

{
Expand Down Expand Up @@ -377,6 +378,7 @@ namespace Nestopia
);

application[ "favored-system-always-ask" ].YesNo() = settings.alwaysAskSystem;
application[ "disable-statusmsg" ].YesNo() = settings.disableStatusMsg;
}

{
Expand Down Expand Up @@ -445,6 +447,7 @@ namespace Nestopia
dialog.RadioButton( IDC_PREFERENCES_FAVORED_DENDY ).Check( settings.favoredSystem == Nes::Machine::FAVORED_DENDY );

dialog.CheckBox( IDC_PREFERENCES_FAVORED_ALWAYS_ASK ).Check( settings.alwaysAskSystem );
dialog.CheckBox( IDC_PREFERENCES_DISABLE_STATUSMSG ).Check( settings.disableStatusMsg );

{
Control::ComboBox priorities( dialog.ComboBox( IDC_PREFERENCES_PRIORITY ) );
Expand Down Expand Up @@ -572,6 +575,7 @@ namespace Nestopia
dialog.CheckBox( IDC_PREFERENCES_SAVE_NETPLAY_GAMELIST ).Check( true );
dialog.CheckBox( IDC_PREFERENCES_SAVE_WINDOWPOS ).Check( false );
dialog.CheckBox( IDC_PREFERENCES_SAVE_LAUNCHERSIZE ).Check( false );
dialog.CheckBox( IDC_PREFERENCES_DISABLE_STATUSMSG ).Check( true );

dialog.ComboBox( IDC_PREFERENCES_PRIORITY )[ PRIORITY_NORMAL ].Select();

Expand Down Expand Up @@ -623,6 +627,7 @@ namespace Nestopia
);

settings.alwaysAskSystem = dialog.RadioButton( IDC_PREFERENCES_FAVORED_ALWAYS_ASK ).Checked();
settings.disableStatusMsg = dialog.RadioButton( IDC_PREFERENCES_DISABLE_STATUSMSG ).Checked();

Application::Instance::SetIconStyle( dialog.RadioButton(IDC_PREFERENCES_STYLE_NES).Checked() ? Application::Instance::ICONSTYLE_NES : Application::Instance::ICONSTYLE_FAMICOM );

Expand Down
4 changes: 3 additions & 1 deletion source/win32/NstDialogPreferences.hpp
View file
Expand Up @@ -60,7 +60,8 @@ namespace Nestopia
SAVE_WINDOWPOS,
SAVE_LAUNCHERSIZE,
SAVE_SETTINGS,
NUM_SETTINGS
NUM_SETTINGS,
DISABLE_STATUSMSG
};

enum Priority
Expand Down Expand Up @@ -104,6 +105,7 @@ namespace Nestopia
Priority priority;
Nes::Machine::FavoredSystem favoredSystem;
bool alwaysAskSystem;
bool disableStatusMsg;
MenuLook menuLookDesktop;
MenuLook menuLookFullscreen;
};
Expand Down
4 changes: 3 additions & 1 deletion source/win32/NstManagerPreferences.cpp
View file
Expand Up @@ -47,7 +47,8 @@ namespace Nestopia
Preferences::SAVE_WINDOWPOS - Window::Preferences::SAVE_WINDOWPOS == 0 &&
Preferences::SAVE_LAUNCHERSIZE - Window::Preferences::SAVE_LAUNCHERSIZE == 0 &&
Preferences::SAVE_SETTINGS - Window::Preferences::SAVE_SETTINGS == 0 &&
Preferences::NUM_SETTINGS - Window::Preferences::NUM_SETTINGS == 0
Preferences::NUM_SETTINGS - Window::Preferences::NUM_SETTINGS == 0 &&
Preferences::DISABLE_STATUSMSG - Window::Preferences::DISABLE_STATUSMSG == 0
);

NST_COMPILE_ASSERT
Expand Down Expand Up @@ -95,6 +96,7 @@ namespace Nestopia
settings.priority = static_cast<Priority>(dialog->GetSettings().priority);
settings.favoredSystem = dialog->GetSettings().favoredSystem;
settings.alwaysAskSystem = dialog->GetSettings().alwaysAskSystem;
settings.disableStatusMsg = dialog->GetSettings().disableStatusMsg;

UpdateMenuColor();
}
Expand Down
4 changes: 3 additions & 1 deletion source/win32/NstManagerPreferences.hpp
View file
Expand Up @@ -65,7 +65,8 @@ namespace Nestopia
SAVE_WINDOWPOS,
SAVE_LAUNCHERSIZE,
SAVE_SETTINGS,
NUM_SETTINGS
NUM_SETTINGS,
DISABLE_STATUSMSG
};

enum Priority
Expand Down Expand Up @@ -93,6 +94,7 @@ namespace Nestopia
Priority priority;
Nes::Machine::FavoredSystem favoredSystem;
bool alwaysAskSystem;
bool disableStatusMsg;
} settings;

Object::Heap<Window::Preferences> dialog;
Expand Down
77 changes: 39 additions & 38 deletions source/win32/language/language.rc
View file
Expand Up @@ -534,33 +534,6 @@ FONT 8, "MS Shell Dlg", 400, 0, 1



LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_VIDEO_FILTER_XBR DIALOG 0, 0, 354, 128
STYLE DS_3DLOOK | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
CAPTION "Filter Options"
FONT 8, "Ms Shell Dlg"
{
DEFPUSHBUTTON "OK", IDOK, 64, 109, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 120, 109, 50, 14
PUSHBUTTON "Default", IDC_VIDEO_FILTER_DEFAULT, 7, 109, 50, 14
GROUPBOX "", IDC_STATIC, 7, 76, 163, 27
GROUPBOX "Blend mode", IDC_STATIC, 7, 41, 163, 34
GROUPBOX "Static", IDC_STATIC, 7, 4, 163, 34
GROUPBOX "Corner rounding", IDC_STATIC, 177, 4, 159, 71
AUTOCHECKBOX "Bilinear interpolation", IDC_VIDEO_FILTER_BILINEAR, 14, 87, 81, 9, WS_GROUP
AUTOCHECKBOX "Blend pixels", IDC_VIDEO_FILTER_BLEND, 14, 56, 81, 10, WS_GROUP
AUTORADIOBUTTON "Auto", IDC_VIDEO_FILTER_XBR_SCALING_AUTO, 13, 20, 31, 10
AUTORADIOBUTTON "2x", IDC_VIDEO_FILTER_XBR_SCALING_2X, 59, 20, 24, 10
AUTORADIOBUTTON "3x", IDC_VIDEO_FILTER_XBR_SCALING_3X, 98, 20, 24, 10, WS_GROUP
AUTORADIOBUTTON "4x", IDC_VIDEO_FILTER_XBR_SCALING_4X, 137, 20, 24, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Round all corners", IDC_VIDEO_FILTER_XBR_ROUNDING_ALL, 183, 20, 71, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Round some corners", IDC_VIDEO_FILTER_XBR_ROUNDING_SOME, 183, 38, 77, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Round no corners", IDC_VIDEO_FILTER_XBR_ROUNDING_NONE, 183, 56, 69, 10, WS_GROUP | WS_TABSTOP
LTEXT "xBR v.3.3 (A, B and C) by Hyllian", IDC_VIDEO_FILTER_XBR_CREDIT, 177, 80, 170, 23, SS_LEFT
}



LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_DIPSWITCHES DIALOGEX 0, 0, 221, 201
STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
Expand Down Expand Up @@ -1011,12 +984,12 @@ FONT 8, "MS Shell Dlg", 400, 0, 1


LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_PREFERENCES DIALOGEX 0, 0, 363, 249
IDD_PREFERENCES DIALOGEX 0, 0, 363, 259
STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
CAPTION "Preferences"
FONT 8, "MS Shell Dlg", 400, 0, 1
{
GROUPBOX "Preferences", IDC_STATIC, 7, 7, 145, 163
GROUPBOX "Preferences", IDC_STATIC, 7, 7, 145, 179
AUTOCHECKBOX "Autostart emulation", IDC_PREFERENCES_BEGIN_EMULATION, 14, 23, 79, 10, WS_GROUP
AUTOCHECKBOX "Run in background", IDC_PREFERENCES_RUN_IN_BACKGROUND, 14, 39, 75, 10
AUTOCHECKBOX "Switch to fullscreen on startup", IDC_PREFERENCES_STARTUP_FULLSCREEN, 14, 55, 113, 10
Expand All @@ -1043,23 +1016,24 @@ FONT 8, "MS Shell Dlg", 400, 0, 1
GROUPBOX "Desktop Menu Color", IDC_STATIC, 259, 84, 97, 41
PUSHBUTTON "Edit..", IDC_PREFERENCES_MENUCOLOR_DESKTOP_CHANGE, 311, 94, 36, 13, WS_GROUP
AUTOCHECKBOX "Default", IDC_PREFERENCES_MENUCOLOR_DESKTOP_DEFAULT, 270, 112, 36, 8, WS_GROUP
GROUPBOX "Favored System", IDC_STATIC, 7, 174, 247, 48
AUTORADIOBUTTON "NES NTSC", IDC_PREFERENCES_FAVORED_NES_NTSC, 19, 192, 48, 10, WS_TABSTOP
AUTORADIOBUTTON "NES PAL", IDC_PREFERENCES_FAVORED_NES_PAL, 84, 192, 43, 10
AUTORADIOBUTTON "Famicom", IDC_PREFERENCES_FAVORED_FAMICOM, 144, 192, 43, 10
AUTORADIOBUTTON "Dendy", IDC_PREFERENCES_FAVORED_DENDY, 204, 192, 34, 10
AUTOCHECKBOX "Always ask", IDC_PREFERENCES_FAVORED_ALWAYS_ASK, 197, 207, 50, 12
GROUPBOX "Favored System", IDC_STATIC, 7, 190, 247, 48
AUTORADIOBUTTON "NES NTSC", IDC_PREFERENCES_FAVORED_NES_NTSC, 19, 208, 48, 10, WS_TABSTOP
AUTORADIOBUTTON "NES PAL", IDC_PREFERENCES_FAVORED_NES_PAL, 84, 208, 43, 10
AUTORADIOBUTTON "Famicom", IDC_PREFERENCES_FAVORED_FAMICOM, 144, 208, 43, 10
AUTORADIOBUTTON "Dendy", IDC_PREFERENCES_FAVORED_DENDY, 204, 208, 34, 10
AUTOCHECKBOX "Always ask", IDC_PREFERENCES_FAVORED_ALWAYS_ASK, 197, 223, 50, 12
GROUPBOX "Save on Exit", IDC_STATIC, 259, 133, 97, 89
AUTOCHECKBOX "Netplay list", IDC_PREFERENCES_SAVE_NETPLAY_GAMELIST, 265, 148, 50, 10, WS_GROUP
AUTOCHECKBOX "Launcher list", IDC_PREFERENCES_SAVE_LAUNCHER, 265, 163, 56, 10
AUTOCHECKBOX "Cheat list", IDC_PREFERENCES_SAVE_CHEATCODES, 265, 178, 46, 10
AUTOCHECKBOX "Launcher window size", IDC_PREFERENCES_SAVE_LAUNCHERSIZE, 265, 193, 84, 10
AUTOCHECKBOX "Window position", IDC_PREFERENCES_SAVE_WINDOWPOS, 265, 208, 67, 10
PUSHBUTTON "Default", IDC_PREFERENCES_DEFAULT, 192, 227, 50, 15, WS_GROUP
DEFPUSHBUTTON "OK", IDOK, 249, 227, 50, 15
PUSHBUTTON "Cancel", IDCANCEL, 306, 227, 50, 15
PUSHBUTTON "Default", IDC_PREFERENCES_DEFAULT, 192, 242, 50, 15, WS_GROUP
DEFPUSHBUTTON "OK", IDOK, 249, 242, 50, 15
PUSHBUTTON "Cancel", IDCANCEL, 306, 242, 50, 15
GROUPBOX "Application Priority", IDC_STATIC, 158, 133, 96, 36
COMBOBOX IDC_PREFERENCES_PRIORITY, 165, 148, 84, 46, WS_GROUP | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
AUTOCHECKBOX "Disable Status Messages", IDC_PREFERENCES_DISABLE_STATUSMSG, 14, 167, 95, 8
}


Expand Down Expand Up @@ -1434,6 +1408,33 @@ FONT 8, "MS Shell Dlg", 400, 0, 1



LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_VIDEO_FILTER_XBR DIALOG 0, 0, 354, 128
STYLE DS_3DLOOK | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
CAPTION "Filter Options"
FONT 8, "Ms Shell Dlg"
{
DEFPUSHBUTTON "OK", IDOK, 64, 109, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 120, 109, 50, 14
PUSHBUTTON "Default", IDC_VIDEO_FILTER_DEFAULT, 7, 109, 50, 14
GROUPBOX "", IDC_STATIC, 7, 76, 163, 27
GROUPBOX "Blend mode", IDC_STATIC, 7, 41, 163, 34
GROUPBOX "Static", IDC_STATIC, 7, 4, 163, 34
GROUPBOX "Corner rounding", IDC_STATIC, 177, 4, 159, 71
AUTOCHECKBOX "Bilinear interpolation", IDC_VIDEO_FILTER_BILINEAR, 14, 87, 81, 9, WS_GROUP
AUTOCHECKBOX "Blend pixels", IDC_VIDEO_FILTER_BLEND, 14, 56, 81, 10, WS_GROUP
AUTORADIOBUTTON "Auto", IDC_VIDEO_FILTER_XBR_SCALING_AUTO, 13, 20, 31, 10
AUTORADIOBUTTON "2x", IDC_VIDEO_FILTER_XBR_SCALING_2X, 59, 20, 24, 10
AUTORADIOBUTTON "3x", IDC_VIDEO_FILTER_XBR_SCALING_3X, 98, 20, 24, 10, WS_GROUP
AUTORADIOBUTTON "4x", IDC_VIDEO_FILTER_XBR_SCALING_4X, 137, 20, 24, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Round all corners", IDC_VIDEO_FILTER_XBR_ROUNDING_ALL, 183, 20, 71, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Round some corners", IDC_VIDEO_FILTER_XBR_ROUNDING_SOME, 183, 38, 77, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Round no corners", IDC_VIDEO_FILTER_XBR_ROUNDING_NONE, 183, 56, 69, 10, WS_GROUP | WS_TABSTOP
LTEXT "xBR v.3.3 (A, B and C) by Hyllian", IDC_VIDEO_FILTER_XBR_CREDIT, 177, 80, 170, 23, SS_LEFT
}



//
// String Table resources
//
Expand Down

0 comments on commit 63ec240

Please sign in to comment.