LIV2/amiberry
1
0
Fork 0
mirror of https://github.com/LIV2/amiberry.git synced 2025-12-06 06:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gui themes (#1488)

Browse Source 
* enhancement: Add new GUI panel, for handling GUI Themes

* Merged preview into gui-themes

* add more widgets on panel

* replaced textfields with sliders

* refactor: optimize PanelThemes

Remove duplicate code, simplify and optimize

* refactor: further optimize PanelThemes

* enhancement: added color box in PanelThemes

* refactor: Themes are now external files, not in amiberry.conf anymore

- Move themes outside of amiberry.conf
- only the theme name remains in amiberry.conf, which points to the filename to use. The default is "default.cfg" and it will be created on startup, if it's missing, with the default theme values.
- added "themes" directory and automatic creation of it on startup, if missing. The location is under XDG_DATA_HOME (~/.local/share/amiberry/themes by default)
- refactored code, themes are now loaded during the prefs_to_gui stage
- added functions for loading/saving themes to filenames

* refactor: load a fallback font if the theme one wasn't found

- Fallback to a standard system font, if the theme one wasn't found
- Enable anti-alias for GUI font
- Create default theme file if it's missing
- Added themes dropdown in GUI

* don't need the extra slash

* refactor: rename theme extension to .theme, load one on startup

- Changed .cfg to .theme for themes
- Load the selected theme on startup
- Set the defaults if the theme is missing a font name

* refactor: rename textbox_background_color to background_color

* feat: added ability to set Global widget colors

* bugfix: SelectFile didn't work when creating new files

* refactor: rename default theme to Default.theme

* added Save As option in Themes

* doc: improved help text in Themes panel

* added some navigation for the Themes panel

Sliders are not included, as they don't have unique IDs yet
This commit is contained in:
Dimitris Panokostas 2024-10-19 17:18:02 +02:00 committed by GitHub
parent f252b4d0e6
commit 0ea2e65cab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
47 changed files with 1208 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/SourceFiles.cmake
View File

@ -349,6 +349,7 @@ set(SOURCE_FILES
src/osdep/gui/PanelMisc.cpp
src/osdep/gui/PanelPrio.cpp
src/osdep/gui/PanelSavestate.cpp
src/osdep/gui/PanelThemes.cpp
src/osdep/gui/PanelVirtualKeyboard.cpp
src/osdep/gui/PanelWHDLoad.cpp
src/osdep/gui/main_window.cpp

4
external/libguisan/include/guisan/widget.hpp vendored
View File

@ -684,6 +684,10 @@ namespace gcn
* @since 0.1.0
*/
static void setGlobalFont(Font* font);
static void setGlobalBaseColor(Color color);
static void setGlobalForegroundColor(Color color);
static void setGlobalBackgroundColor(Color color);
static void setGlobalSelectionColor(Color color);
/**
* Sets the font for the widget. If NULL is passed, the global font

36
external/libguisan/src/widget.cpp vendored
View File

@ -506,6 +506,42 @@ namespace gcn
}
}
void Widget::setGlobalBaseColor(Color color)
{
std::list<Widget*>::iterator iter;
for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter)
{
(*iter)->setBaseColor(color);
}
}
void Widget::setGlobalForegroundColor(Color color)
{
std::list<Widget*>::iterator iter;
for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter)
{
(*iter)->setForegroundColor(color);
}
}
void Widget::setGlobalBackgroundColor(Color color)
{
std::list<Widget*>::iterator iter;
for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter)
{
(*iter)->setBackgroundColor(color);
}
}
void Widget::setGlobalSelectionColor(Color color)
{
std::list<Widget*>::iterator iter;
for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter)
{
(*iter)->setSelectionColor(color);
}
}
void Widget::setFont(Font* font)
{
mCurrentFont = font;

12
src/include/options.h
View File

@ -1296,7 +1296,7 @@ struct amiberry_gui_theme
gcn::Color base_color;
gcn::Color selector_inactive;
gcn::Color selector_active;
gcn::Color textbox_background;
gcn::Color background_color;
gcn::Color selection_color;
gcn::Color foreground_color;
std::string font_name;
@ -1360,15 +1360,7 @@ struct amiberry_options
char default_vkbd_style[128] = "Original";
int default_vkbd_transparency;
char default_vkbd_toggle[128] = "guide";
char gui_theme_font_name[128] = "AmigaTopaz.ttf";
int gui_theme_font_size = 15;
char gui_theme_base_color[128] = "170, 170, 170";
char gui_theme_selector_inactive[128] = "170, 170, 170";
char gui_theme_selector_active[128] = "103, 136, 187";
char gui_theme_textbox_background[128] = "220, 220, 220";
char gui_theme_selection_color[128] = "195, 217, 217";
char gui_theme_foreground_color[128] = "0, 0, 0";
char gui_theme_font_color[128] = "0, 0, 0";
char gui_theme[128] = "Default.theme";
};
extern struct amiberry_options amiberry_options;

277
src/osdep/amiberry.cpp
View File

@ -212,7 +212,7 @@ amiberry_hotkey get_hotkey_from_config(std::string config_option)
return hotkey;
}
void set_key_configs(struct uae_prefs* p)
void set_key_configs(const struct uae_prefs* p)
{
if (strncmp(p->open_gui, "", 1) != 0)
// If we have a value in the config, we use that instead
@ -310,6 +310,7 @@ std::string screenshot_dir;
std::string nvram_dir;
std::string plugins_dir;
std::string video_dir;
std::string themes_path;
std::string amiberry_conf_file;
char last_loaded_config[MAX_DPATH] = {'\0'};
@ -2380,179 +2381,6 @@ void target_default_options(struct uae_prefs* p, int type)
_tcscpy(p->vkbd_style, ""); // This will use the default theme.
p->vkbd_transparency = amiberry_options.default_vkbd_transparency;
_tcscpy(p->vkbd_toggle, amiberry_options.default_vkbd_toggle);
//
// GUI Theme section
//
// Font name
if (amiberry_options.gui_theme_font_name[0])
gui_theme.font_name = std::string(amiberry_options.gui_theme_font_name);
else
gui_theme.font_name = "AmigaTopaz.ttf";
// Font size
gui_theme.font_size = amiberry_options.gui_theme_font_size > 0 ? amiberry_options.gui_theme_font_size : 15;
// Base Color
if (amiberry_options.gui_theme_base_color[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_base_color);
if (result.size() == 3)
{
gui_theme.base_color = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.base_color = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.base_color = gcn::Color(170, 170, 170);
}
}
else
{
gui_theme.base_color = gcn::Color(170, 170, 170);
}
// Font color
if (amiberry_options.gui_theme_font_color[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_font_color);
if (result.size() == 3)
{
gui_theme.font_color = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.font_color = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.font_color = gcn::Color(0, 0, 0);
}
}
else
{
gui_theme.font_color = gcn::Color(0, 0, 0);
}
// Selector Inactive
if (amiberry_options.gui_theme_selector_inactive[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_selector_inactive);
if (result.size() == 3)
{
gui_theme.selector_inactive = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.selector_inactive = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.selector_inactive = gcn::Color(170, 170, 170);
}
}
else
{
gui_theme.selector_inactive = gcn::Color(170, 170, 170);
}
// Selector Active
if (amiberry_options.gui_theme_selector_active[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_selector_active);
if (result.size() == 3)
{
gui_theme.selector_active = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.selector_active = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.selector_active = gcn::Color(103, 136, 187);
}
}
else
{
gui_theme.selector_active = gcn::Color(103, 136, 187);
}
// Textbox Background
if (amiberry_options.gui_theme_textbox_background[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_textbox_background);
if (result.size() == 3)
{
gui_theme.textbox_background = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.textbox_background = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.textbox_background = gcn::Color(220, 220, 220);
}
}
else
{
gui_theme.textbox_background = gcn::Color(220, 220, 220);
}
// Selection color (e.g. dropdowns)
if (amiberry_options.gui_theme_selection_color[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_selection_color);
if (result.size() == 3)
{
gui_theme.selection_color = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.selection_color = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.selection_color = gcn::Color(195, 217, 217);
}
}
else
{
gui_theme.selection_color = gcn::Color(195, 217, 217);
}
// Foreground color
if (amiberry_options.gui_theme_foreground_color[0])
{
// parse string as comma-separated numbers
const std::vector<int> result = parse_color_string(amiberry_options.gui_theme_foreground_color);
if (result.size() == 3)
{
gui_theme.foreground_color = gcn::Color(result[0], result[1], result[2]);
}
else if (result.size() == 4)
{
gui_theme.foreground_color = gcn::Color(result[0], result[1], result[2], result[3]);
}
else
{
gui_theme.foreground_color = gcn::Color(0, 0, 0);
}
}
else
{
gui_theme.foreground_color = gcn::Color(0, 0, 0);
}
}
static const TCHAR* scsimode[] = { _T("SCSIEMU"), _T("SPTI"), _T("SPTI+SCSISCAN"), NULL };
@ -3040,6 +2868,11 @@ void set_video_path(const std::string& newpath)
video_dir = newpath;
}
void set_themes_path(const std::string& newpath)
{
themes_path = newpath;
}
void set_screenshot_path(const std::string& newpath)
{
screenshot_dir = newpath;
@ -3213,6 +3046,11 @@ void get_video_path(char* out, int size)
_tcsncpy(out, fix_trailing(video_dir).c_str(), size - 1);
}
std::string get_themes_path()
{
return fix_trailing(themes_path);
}
void get_floppy_sounds_path(char* out, int size)
{
_tcsncpy(out, fix_trailing(floppy_sounds_dir).c_str(), size - 1);
@ -3583,32 +3421,8 @@ void save_amiberry_settings(void)
// Default controller button for toggling the Virtual Keyboard
write_string_option("default_vkbd_toggle", amiberry_options.default_vkbd_toggle);
// GUI Theme: Font name
write_string_option("gui_theme_font_name", amiberry_options.gui_theme_font_name);
// GUI Theme: Font size
write_int_option("gui_theme_font_size", amiberry_options.gui_theme_font_size);
// GUI Theme: Font color
write_string_option("gui_theme_font_color", amiberry_options.gui_theme_font_color);
// GUI Theme: Base color
write_string_option("gui_theme_base_color", amiberry_options.gui_theme_base_color);
// GUI Theme: Selector Inactive color
write_string_option("gui_theme_selector_inactive", amiberry_options.gui_theme_selector_inactive);
// GUI Theme: Selector Active color
write_string_option("gui_theme_selector_active", amiberry_options.gui_theme_selector_active);
// GUI Theme: Selection color
write_string_option("gui_theme_selection_color", amiberry_options.gui_theme_selection_color);
// GUI Theme: Foreground color
write_string_option("gui_theme_foreground_color", amiberry_options.gui_theme_foreground_color);
// GUI Theme: Textbox Background color
write_string_option("gui_theme_textbox_background", amiberry_options.gui_theme_textbox_background);
// GUI Theme
write_string_option("gui_theme", amiberry_options.gui_theme);
// Paths
write_string_option("controllers_path", controllers_path);
@ -3630,6 +3444,7 @@ void save_amiberry_settings(void)
write_string_option("nvram_dir", nvram_dir);
write_string_option("plugins_dir", plugins_dir);
write_string_option("video_dir", video_dir);
write_string_option("themes_path", themes_path);
// The number of ROMs in the last scan
snprintf(buffer, MAX_DPATH, "ROMs=%zu\n", lstAvailableROMs.size());
@ -3771,6 +3586,7 @@ static int parse_amiberry_settings_line(const char *path, char *linea)
ret |= cfgfile_string(option, value, "nvram_dir", nvram_dir);
ret |= cfgfile_string(option, value, "plugins_dir", plugins_dir);
ret |= cfgfile_string(option, value, "video_dir", video_dir);
ret |= cfgfile_string(option, value, "themes_path", themes_path);
// NOTE: amiberry_config is a "read only", i.e. it's not written in
// save_amiberry_settings(). It's purpose is to provide -o amiberry_config=path
// command line option.
@ -3833,15 +3649,7 @@ static int parse_amiberry_settings_line(const char *path, char *linea)
ret |= cfgfile_string(option, value, "default_vkbd_style", amiberry_options.default_vkbd_style, sizeof amiberry_options.default_vkbd_style);
ret |= cfgfile_intval(option, value, "default_vkbd_transparency", &amiberry_options.default_vkbd_transparency, 1);
ret |= cfgfile_string(option, value, "default_vkbd_toggle", amiberry_options.default_vkbd_toggle, sizeof amiberry_options.default_vkbd_toggle);
ret |= cfgfile_string(option, value, "gui_theme_font_name", amiberry_options.gui_theme_font_name, sizeof amiberry_options.gui_theme_font_name);
ret |= cfgfile_intval(option, value, "gui_theme_font_size", &amiberry_options.gui_theme_font_size, 1);
ret |= cfgfile_string(option, value, "gui_theme_font_color", amiberry_options.gui_theme_font_color, sizeof amiberry_options.gui_theme_font_color);
ret |= cfgfile_string(option, value, "gui_theme_base_color", amiberry_options.gui_theme_base_color, sizeof amiberry_options.gui_theme_base_color);
ret |= cfgfile_string(option, value, "gui_theme_selector_inactive", amiberry_options.gui_theme_selector_inactive, sizeof amiberry_options.gui_theme_selector_inactive);
ret |= cfgfile_string(option, value, "gui_theme_selector_active", amiberry_options.gui_theme_selector_active, sizeof amiberry_options.gui_theme_selector_active);
ret |= cfgfile_string(option, value, "gui_theme_selection_color", amiberry_options.gui_theme_selection_color, sizeof amiberry_options.gui_theme_selection_color);
ret |= cfgfile_string(option, value, "gui_theme_foreground_color", amiberry_options.gui_theme_foreground_color, sizeof amiberry_options.gui_theme_foreground_color);
ret |= cfgfile_string(option, value, "gui_theme_textbox_background", amiberry_options.gui_theme_textbox_background, sizeof amiberry_options.gui_theme_textbox_background);
ret |= cfgfile_string(option, value, "gui_theme", amiberry_options.gui_theme, sizeof amiberry_options.gui_theme);
}
return ret;
}
@ -4137,6 +3945,10 @@ std::string get_plugins_directory()
#endif
}
extern void save_theme(const std::string& theme_filename);
extern void load_theme(const std::string& theme_filename);
extern void load_default_theme();
void create_missing_amiberry_folders()
{
#ifdef __MACH__
@ -4211,22 +4023,32 @@ void create_missing_amiberry_folders()
system(command.c_str());
}
}
if (!my_existsdir(rp9_path.c_str()))
my_mkdir(rp9_path.c_str());
if (!my_existsdir(saveimage_dir.c_str()))
my_mkdir(saveimage_dir.c_str());
if (!my_existsdir(savestate_dir.c_str()))
my_mkdir(savestate_dir.c_str());
if (!my_existsdir(ripper_path.c_str()))
my_mkdir(ripper_path.c_str());
if (!my_existsdir(input_dir.c_str()))
my_mkdir(input_dir.c_str());
if (!my_existsdir(screenshot_dir.c_str()))
my_mkdir(screenshot_dir.c_str());
if (!my_existsdir(nvram_dir.c_str()))
my_mkdir(nvram_dir.c_str());
if (!my_existsdir(video_dir.c_str()))
my_mkdir(video_dir.c_str());
if (!my_existsdir(rp9_path.c_str()))
my_mkdir(rp9_path.c_str());
if (!my_existsdir(saveimage_dir.c_str()))
my_mkdir(saveimage_dir.c_str());
if (!my_existsdir(savestate_dir.c_str()))
my_mkdir(savestate_dir.c_str());
if (!my_existsdir(ripper_path.c_str()))
my_mkdir(ripper_path.c_str());
if (!my_existsdir(input_dir.c_str()))
my_mkdir(input_dir.c_str());
if (!my_existsdir(screenshot_dir.c_str()))
my_mkdir(screenshot_dir.c_str());
if (!my_existsdir(nvram_dir.c_str()))
my_mkdir(nvram_dir.c_str());
if (!my_existsdir(video_dir.c_str()))
my_mkdir(video_dir.c_str());
if (!my_existsdir(themes_path.c_str()))
{
my_mkdir(themes_path.c_str());
}
std::string default_theme_file = themes_path + "Default.theme";
if (!my_existsfile2(default_theme_file.c_str()))
{
load_default_theme();
save_theme("Default.theme");
}
}
static void init_amiberry_dirs()
@ -4253,11 +4075,12 @@ static void init_amiberry_dirs()
// The amiberry.conf file is always in the XDG_CONFIG_HOME/amiberry directory
amiberry_conf_file = xdg_config_home + "/amiberry.conf";
themes_path = xdg_config_home;
// These paths are relative to the XDG_DATA_HOME directory
controllers_path = whdboot_path = saveimage_dir = savestate_dir =
ripper_path = input_dir = screenshot_dir = nvram_dir = video_dir =
xdg_data_home;
xdg_data_home;
// These go in $HOME/Amiberry by default
whdload_arch_path = floppy_path = harddrive_path =
@ -4281,6 +4104,7 @@ static void init_amiberry_dirs()
screenshot_dir.append("/Screenshots/");
nvram_dir.append("/Nvram/");
video_dir.append("/Videos/");
themes_path.append("/Themes/");
#else
controllers_path.append("/controllers/");
whdboot_path.append("/whdboot/");
@ -4298,6 +4122,7 @@ static void init_amiberry_dirs()
screenshot_dir.append("/screenshots/");
nvram_dir.append("/nvram/");
video_dir.append("/videos/");
themes_path.append("/themes/");
#endif
retroarch_file = config_path;

197
src/osdep/amiberry_gui.cpp
View File

@ -40,6 +40,7 @@
#include "gayle.h"
#include "parser.h"
#include "scsi.h"
#include "target.h"
#ifdef AMIBERRY
#ifndef __MACH__
@ -411,6 +412,14 @@ bool gui_ask_disk(int drv, TCHAR *name)
static void prefs_to_gui()
{
//
// GUI Theme section
//
if (amiberry_options.gui_theme[0])
load_theme(amiberry_options.gui_theme);
else
load_default_theme();
/* filesys hack */
changed_prefs.mountitems = currprefs.mountitems;
memcpy(&changed_prefs.mountconfig, &currprefs.mountconfig, MOUNT_CONFIG_SIZE * sizeof(struct uaedev_config_info));
@ -1391,4 +1400,190 @@ void save_mapping_to_file(const std::string& mapping)
file_output << '\n' << mapping << '\n';
file_output.close();
}
}
}
void load_default_theme()
{
gui_theme.font_name = "AmigaTopaz.ttf";
gui_theme.font_size = 15;
gui_theme.font_color = { 0, 0, 0 };
gui_theme.base_color = { 170, 170, 170 };
gui_theme.selector_inactive = { 170, 170, 170 };
gui_theme.selector_active = { 103, 136, 187 };
gui_theme.selection_color = { 195, 217, 217 };
gui_theme.background_color = { 220, 220, 220 };
gui_theme.foreground_color = { 0, 0, 0 };
}
// Get the path to the system fonts
std::string get_system_fonts_path()
{
std::string path;
#ifdef _WIN32
char buffer[MAX_DPATH];
GetWindowsDirectoryA(buffer, MAX_DPATH);
path = buffer;
path.append("\\Fonts\\");
#else
path = "/usr/share/fonts/truetype/";
#endif
return path;
}
void apply_theme()
{
gui_base_color = gui_theme.base_color;
gui_foreground_color = gui_theme.foreground_color;
gui_background_color = gui_theme.background_color;
gui_selection_color = gui_theme.selection_color;
gui_selector_inactive_color = gui_theme.selector_inactive;
gui_selector_active_color = gui_theme.selector_active;
gui_font_color = gui_theme.font_color;
if (gui_theme.font_name.empty())
{
load_default_theme();
}
try
{
// Check if the font_name contains the full path to the file (e.g. in /usr/share/fonts)
if (my_existsfile2(gui_theme.font_name.c_str()))
{
gui_font = new gcn::SDLTrueTypeFont(gui_theme.font_name, gui_theme.font_size);
}
else
{
// If only a font name was given, try to open it from the data directory
std::string font = get_data_path();
font.append(gui_theme.font_name);
if (my_existsfile2(font.c_str()))
gui_font = new gcn::SDLTrueTypeFont(font, gui_theme.font_size);
else
{
// If the font file was not found in the data directory, fallback to a system font
// TODO This needs a separate implementation for macOS!
font = get_system_fonts_path();
font.append("freefont/FreeSans.ttf");
}
}
gui_font->setAntiAlias(true);
gui_font->setColor(gui_font_color);
}
catch (gcn::Exception& e)
{
gui_running = false;
std::cout << e.getMessage() << '\n';
write_log("An error occurred while trying to open the GUI font! Exception: %s\n", e.getMessage().c_str());
abort();
}
catch (std::exception& ex)
{
gui_running = false;
cout << ex.what() << '\n';
write_log("An error occurred while trying to open the GUI font! Exception: %s\n", ex.what());
abort();
}
gcn::Widget::setGlobalFont(gui_font);
gcn::Widget::setGlobalBaseColor(gui_base_color);
gcn::Widget::setGlobalForegroundColor(gui_foreground_color);
gcn::Widget::setGlobalBackgroundColor(gui_background_color);
gcn::Widget::setGlobalSelectionColor(gui_selection_color);
if (selectors != nullptr)
{
selectors->setBaseColor(gui_base_color);
selectors->setBackgroundColor(gui_base_color);
selectors->setForegroundColor(gui_foreground_color);
}
if (selectorsScrollArea != nullptr)
{
selectorsScrollArea->setBaseColor(gui_base_color);
selectorsScrollArea->setBackgroundColor(gui_base_color);
selectorsScrollArea->setForegroundColor(gui_foreground_color);
}
for (int i = 0; categories[i].category != nullptr && categories[i].selector != nullptr; ++i)
{
categories[i].selector->setActiveColor(gui_selector_active_color);
categories[i].selector->setInactiveColor(gui_selector_inactive_color);
categories[i].panel->setBaseColor(gui_base_color);
categories[i].panel->setForegroundColor(gui_foreground_color);
}
}
void save_theme(const std::string& theme_filename)
{
std::string filename = get_themes_path();
filename.append(theme_filename);
std::ofstream file_output; // out file stream
file_output.open(filename, ios::out);
if (file_output.is_open())
{
file_output << "font_name=" << gui_theme.font_name << '\n';
file_output << "font_size=" << gui_theme.font_size << '\n';
file_output << "font_color=" << gui_theme.font_color.r << "," << gui_theme.font_color.g << "," << gui_theme.font_color.b << '\n';
file_output << "base_color=" << gui_theme.base_color.r << "," << gui_theme.base_color.g << "," << gui_theme.base_color.b << '\n';
file_output << "selector_inactive=" << gui_theme.selector_inactive.r << "," << gui_theme.selector_inactive.g << "," << gui_theme.selector_inactive.b << '\n';
file_output << "selector_active=" << gui_theme.selector_active.r << "," << gui_theme.selector_active.g << "," << gui_theme.selector_active.b << '\n';
file_output << "selection_color=" << gui_theme.selection_color.r << "," << gui_theme.selection_color.g << "," << gui_theme.selection_color.b << '\n';
file_output << "background_color=" << gui_theme.background_color.r << "," << gui_theme.background_color.g << "," << gui_theme.background_color.b << '\n';
file_output << "foreground_color=" << gui_theme.foreground_color.r << "," << gui_theme.foreground_color.g << "," << gui_theme.foreground_color.b << '\n';
file_output.close();
}
}
void load_theme(const std::string& theme_filename)
{
std::string filename = get_themes_path();
filename.append(theme_filename);
std::ifstream file_input(filename);
if (file_input.is_open())
{
std::string line;
while (std::getline(file_input, line))
{
std::string key = line.substr(0, line.find('='));
std::string value = line.substr(line.find('=') + 1);
if (key == "font_name")
gui_theme.font_name = value;
else if (key == "font_size")
gui_theme.font_size = std::stoi(value);
else if (key == "font_color")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.font_color = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
else if (key == "base_color")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.base_color = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
else if (key == "selector_inactive")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.selector_inactive = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
else if (key == "selector_active")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.selector_active = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
else if (key == "selection_color")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.selection_color = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
else if (key == "background_color")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.background_color = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
else if (key == "foreground_color")
{
const std::vector<int> rgb = parse_color_string(value);
gui_theme.foreground_color = gcn::Color(rgb[0], rgb[1], rgb[2]);
}
}
file_input.close();
}
}

6
src/osdep/gui/CreateFilesysHardfile.cpp
View File

@ -114,12 +114,12 @@ static void InitCreateFilesysHardfile()
txtSize = new gcn::TextField();
txtSize->setSize(60, TEXTFIELD_HEIGHT);
txtSize->setBaseColor(gui_base_color);
txtSize->setBackgroundColor(gui_textbox_background_color);
txtSize->setBackgroundColor(gui_background_color);
txtSize->setForegroundColor(gui_foreground_color);
chkDynamic = new gcn::CheckBox("Dynamic VHD", true);
chkDynamic->setBaseColor(gui_base_color);
chkDynamic->setBackgroundColor(gui_textbox_background_color);
chkDynamic->setBackgroundColor(gui_background_color);
chkDynamic->setForegroundColor(gui_foreground_color);
chkDynamic->setId("chkDynamic");
@ -129,7 +129,7 @@ static void InitCreateFilesysHardfile()
txtPath->setId("txtCreatePath");
txtPath->setSize(500, TEXTFIELD_HEIGHT);
txtPath->setBaseColor(gui_base_color);
txtPath->setBackgroundColor(gui_textbox_background_color);
txtPath->setBackgroundColor(gui_background_color);
txtPath->setForegroundColor(gui_foreground_color);
cmdPath = new gcn::Button("...");

2
src/osdep/gui/CreateFolder.cpp
View File

@ -84,7 +84,7 @@ static void InitCreateFolder(const std::string& path)
txtCreateFolder->setSize(DIALOG_WIDTH - 2 * DISTANCE_BORDER - 4, TEXTFIELD_HEIGHT);
txtCreateFolder->setBaseColor(gui_base_color);
txtCreateFolder->setForegroundColor(gui_foreground_color);
txtCreateFolder->setBackgroundColor(gui_textbox_background_color);
txtCreateFolder->setBackgroundColor(gui_background_color);
txtCreateFolder->setPosition(lblCreateFolder->getX(), lblCreateFolder->getY() + lblCreateFolder->getHeight() + DISTANCE_NEXT_Y);
txtCreateFolder->setEnabled(true);
txtCreateFolder->setText("");

10
src/osdep/gui/EditFilesysHardDrive.cpp
View File

@ -197,7 +197,7 @@ static void InitEditFilesysHardDrive()
txtHDPath->setSize(500, TEXTFIELD_HEIGHT);
txtHDPath->setId("txtHDDPath");
txtHDPath->setBaseColor(gui_base_color);
txtHDPath->setBackgroundColor(gui_textbox_background_color);
txtHDPath->setBackgroundColor(gui_background_color);
txtHDPath->setForegroundColor(gui_foreground_color);
lblHDController = new gcn::Label("Controller:");
@ -205,7 +205,7 @@ static void InitEditFilesysHardDrive()
cboHDController = new gcn::DropDown(&controllerListModel);
cboHDController->setSize(200, DROPDOWN_HEIGHT);
cboHDController->setBaseColor(gui_base_color);
cboHDController->setBackgroundColor(gui_textbox_background_color);
cboHDController->setBackgroundColor(gui_background_color);
cboHDController->setForegroundColor(gui_foreground_color);
cboHDController->setSelectionColor(gui_selection_color);
cboHDController->setId("cboHDController");
@ -214,7 +214,7 @@ static void InitEditFilesysHardDrive()
cboHDControllerUnit = new gcn::DropDown(&unitListModel);
cboHDControllerUnit->setSize(60, DROPDOWN_HEIGHT);
cboHDControllerUnit->setBaseColor(gui_base_color);
cboHDControllerUnit->setBackgroundColor(gui_textbox_background_color);
cboHDControllerUnit->setBackgroundColor(gui_background_color);
cboHDControllerUnit->setForegroundColor(gui_foreground_color);
cboHDControllerUnit->setSelectionColor(gui_selection_color);
cboHDControllerUnit->setId("cboHDControllerUnit");
@ -223,7 +223,7 @@ static void InitEditFilesysHardDrive()
cboHDControllerType = new gcn::DropDown(&controllerTypeListModel);
cboHDControllerType->setSize(60, DROPDOWN_HEIGHT);
cboHDControllerType->setBaseColor(gui_base_color);
cboHDControllerType->setBackgroundColor(gui_textbox_background_color);
cboHDControllerType->setBackgroundColor(gui_background_color);
cboHDControllerType->setForegroundColor(gui_foreground_color);
cboHDControllerType->setSelectionColor(gui_selection_color);
cboHDControllerType->setId("cboHDControllerType");
@ -232,7 +232,7 @@ static void InitEditFilesysHardDrive()
cboHDFeatureLevel = new gcn::DropDown(&hdFeatureLevelListModel);
cboHDFeatureLevel->setSize(80, DROPDOWN_HEIGHT);
cboHDFeatureLevel->setBaseColor(gui_base_color);
cboHDFeatureLevel->setBackgroundColor(gui_textbox_background_color);
cboHDFeatureLevel->setBackgroundColor(gui_background_color);
cboHDFeatureLevel->setForegroundColor(gui_foreground_color);
cboHDFeatureLevel->setSelectionColor(gui_selection_color);
cboHDFeatureLevel->setId("cboHDFeatureLevel");

38
src/osdep/gui/EditFilesysHardfile.cpp
View File

@ -411,7 +411,7 @@ static void InitEditFilesysHardfile()
txtHfPath->setSize(500, TEXTFIELD_HEIGHT);
txtHfPath->setId("txtHdfPath");
txtHfPath->setBaseColor(gui_base_color);
txtHfPath->setBackgroundColor(gui_textbox_background_color);
txtHfPath->setBackgroundColor(gui_background_color);
txtHfPath->setForegroundColor(gui_foreground_color);
cmdHfPath = new gcn::Button("...");
@ -427,7 +427,7 @@ static void InitEditFilesysHardfile()
txtHfGeometry->setSize(500, TEXTFIELD_HEIGHT);
txtHfGeometry->setId("txtHdfGeometry");
txtHfGeometry->setBaseColor(gui_base_color);
txtHfGeometry->setBackgroundColor(gui_textbox_background_color);
txtHfGeometry->setBackgroundColor(gui_background_color);
txtHfGeometry->setForegroundColor(gui_foreground_color);
cmdHfGeometry = new gcn::Button("...");
@ -443,7 +443,7 @@ static void InitEditFilesysHardfile()
txtHfFilesys->setSize(500, TEXTFIELD_HEIGHT);
txtHfFilesys->setId("txtHdfFilesys");
txtHfFilesys->setBaseColor(gui_base_color);
txtHfFilesys->setBackgroundColor(gui_textbox_background_color);
txtHfFilesys->setBackgroundColor(gui_background_color);
txtHfFilesys->setForegroundColor(gui_foreground_color);
cmdHfFilesys = new gcn::Button("...");
@ -459,7 +459,7 @@ static void InitEditFilesysHardfile()
txtDevice->setId("txtHdfDev");
txtDevice->setSize(100, TEXTFIELD_HEIGHT);
txtDevice->setBaseColor(gui_base_color);
txtDevice->setBackgroundColor(gui_textbox_background_color);
txtDevice->setBackgroundColor(gui_background_color);
txtDevice->setForegroundColor(gui_foreground_color);
txtDevice->addFocusListener(filesysHardfileFocusListener);
@ -469,35 +469,35 @@ static void InitEditFilesysHardfile()
txtBootPri->setId("txtHdfBootPri");
txtBootPri->setSize(40, TEXTFIELD_HEIGHT);
txtBootPri->setBaseColor(gui_base_color);
txtBootPri->setBackgroundColor(gui_textbox_background_color);
txtBootPri->setBackgroundColor(gui_background_color);
txtBootPri->setForegroundColor(gui_foreground_color);
txtBootPri->addFocusListener(filesysHardfileFocusListener);
chkReadWrite = new gcn::CheckBox("Read/Write", true);
chkReadWrite->setId("chkHdfRW");
chkReadWrite->setBaseColor(gui_base_color);
chkReadWrite->setBackgroundColor(gui_textbox_background_color);
chkReadWrite->setBackgroundColor(gui_background_color);
chkReadWrite->setForegroundColor(gui_foreground_color);
chkReadWrite->addActionListener(filesysHardfileActionListener);
chkVirtBootable = new gcn::CheckBox("Bootable", true);
chkVirtBootable->setId("hdfAutoboot");
chkVirtBootable->setBaseColor(gui_base_color);
chkVirtBootable->setBackgroundColor(gui_textbox_background_color);
chkVirtBootable->setBackgroundColor(gui_background_color);
chkVirtBootable->setForegroundColor(gui_foreground_color);
chkVirtBootable->addActionListener(filesysHardfileActionListener);
chkDoNotMount = new gcn::CheckBox("Do not mount");
chkDoNotMount->setId("chkHdfDoNotMount");
chkDoNotMount->setBaseColor(gui_base_color);
chkDoNotMount->setBackgroundColor(gui_textbox_background_color);
chkDoNotMount->setBackgroundColor(gui_background_color);
chkDoNotMount->setForegroundColor(gui_foreground_color);
chkDoNotMount->addActionListener(filesysHardfileActionListener);
chkRdbMode = new gcn::CheckBox("Full drive/RDB mode", false);
chkRdbMode->setId("chkHdfRDB");
chkRdbMode->setBaseColor(gui_base_color);
chkRdbMode->setBackgroundColor(gui_textbox_background_color);
chkRdbMode->setBackgroundColor(gui_background_color);
chkRdbMode->setForegroundColor(gui_foreground_color);
chkRdbMode->addActionListener(filesysHardfileActionListener);
@ -506,7 +506,7 @@ static void InitEditFilesysHardfile()
cboController = new gcn::DropDown(&controllerListModel);
cboController->setSize(250, DROPDOWN_HEIGHT);
cboController->setBaseColor(gui_base_color);
cboController->setBackgroundColor(gui_textbox_background_color);
cboController->setBackgroundColor(gui_background_color);
cboController->setForegroundColor(gui_foreground_color);
cboController->setSelectionColor(gui_selection_color);
cboController->setId("cboHdfController");
@ -515,7 +515,7 @@ static void InitEditFilesysHardfile()
cboUnit = new gcn::DropDown(&unitListModel);
cboUnit->setSize(80, DROPDOWN_HEIGHT);
cboUnit->setBaseColor(gui_base_color);
cboUnit->setBackgroundColor(gui_textbox_background_color);
cboUnit->setBackgroundColor(gui_background_color);
cboUnit->setForegroundColor(gui_foreground_color);
cboUnit->setSelectionColor(gui_selection_color);
cboUnit->setId("cboHdfUnit");
@ -524,7 +524,7 @@ static void InitEditFilesysHardfile()
cboHdfControllerType = new gcn::DropDown(&hdfTypeListModel);
cboHdfControllerType->setSize(80, DROPDOWN_HEIGHT);
cboHdfControllerType->setBaseColor(gui_base_color);
cboHdfControllerType->setBackgroundColor(gui_textbox_background_color);
cboHdfControllerType->setBackgroundColor(gui_background_color);
cboHdfControllerType->setForegroundColor(gui_foreground_color);
cboHdfControllerType->setSelectionColor(gui_selection_color);
cboHdfControllerType->setId("cboHdfControllerType");
@ -533,7 +533,7 @@ static void InitEditFilesysHardfile()
cboHdfFeatureLevel = new gcn::DropDown(&hdfFeatureLevelListModel);
cboHdfFeatureLevel->setSize(168, DROPDOWN_HEIGHT);
cboHdfFeatureLevel->setBaseColor(gui_base_color);
cboHdfFeatureLevel->setBackgroundColor(gui_textbox_background_color);
cboHdfFeatureLevel->setBackgroundColor(gui_background_color);
cboHdfFeatureLevel->setForegroundColor(gui_foreground_color);
cboHdfFeatureLevel->setSelectionColor(gui_selection_color);
cboHdfFeatureLevel->setId("cboHdfFeatureLevel");
@ -542,14 +542,14 @@ static void InitEditFilesysHardfile()
txtHdfLine1 = new gcn::TextField();
txtHdfLine1->setSize(DIALOG_WIDTH - DISTANCE_BORDER * 2, TEXTFIELD_HEIGHT);
txtHdfLine1->setBaseColor(gui_base_color);
txtHdfLine1->setBackgroundColor(gui_textbox_background_color);
txtHdfLine1->setBackgroundColor(gui_background_color);
txtHdfLine1->setForegroundColor(gui_foreground_color);
txtHdfLine1->setEnabled(false);
txtHdfLine2 = new gcn::TextField();
txtHdfLine2->setSize(DIALOG_WIDTH - DISTANCE_BORDER * 2, TEXTFIELD_HEIGHT);
txtHdfLine2->setBaseColor(gui_base_color);
txtHdfLine2->setBackgroundColor(gui_textbox_background_color);
txtHdfLine2->setBackgroundColor(gui_background_color);
txtHdfLine2->setForegroundColor(gui_foreground_color);
txtHdfLine2->setEnabled(false);
@ -558,7 +558,7 @@ static void InitEditFilesysHardfile()
txtSurfaces = new gcn::TextField();
txtSurfaces->setSize(60, TEXTFIELD_HEIGHT);
txtSurfaces->setBaseColor(gui_base_color);
txtSurfaces->setBackgroundColor(gui_textbox_background_color);
txtSurfaces->setBackgroundColor(gui_background_color);
txtSurfaces->setForegroundColor(gui_foreground_color);
txtSurfaces->addFocusListener(filesysHardfileFocusListener);
@ -567,7 +567,7 @@ static void InitEditFilesysHardfile()
txtReserved = new gcn::TextField();
txtReserved->setSize(60, TEXTFIELD_HEIGHT);
txtReserved->setBaseColor(gui_base_color);
txtReserved->setBackgroundColor(gui_textbox_background_color);
txtReserved->setBackgroundColor(gui_background_color);
txtReserved->setForegroundColor(gui_foreground_color);
txtReserved->addFocusListener(filesysHardfileFocusListener);
@ -576,7 +576,7 @@ static void InitEditFilesysHardfile()
txtSectors = new gcn::TextField();
txtSectors->setSize(60, TEXTFIELD_HEIGHT);
txtSectors->setBaseColor(gui_base_color);
txtSectors->setBackgroundColor(gui_textbox_background_color);
txtSectors->setBackgroundColor(gui_background_color);
txtSectors->setForegroundColor(gui_foreground_color);
txtSectors->addFocusListener(filesysHardfileFocusListener);
@ -585,7 +585,7 @@ static void InitEditFilesysHardfile()
txtBlocksize = new gcn::TextField();
txtBlocksize->setSize(60, TEXTFIELD_HEIGHT);
txtBlocksize->setBaseColor(gui_base_color);
txtBlocksize->setBackgroundColor(gui_textbox_background_color);
txtBlocksize->setBackgroundColor(gui_background_color);
txtBlocksize->setForegroundColor(gui_foreground_color);
txtBlocksize->addFocusListener(filesysHardfileFocusListener);

12
src/osdep/gui/EditFilesysVirtual.cpp
View File

@ -171,7 +171,7 @@ static void InitEditFilesysVirtual()
txtDevice->setSize(120, TEXTFIELD_HEIGHT);
txtDevice->setId("txtVirtDevice");
txtDevice->setBaseColor(gui_base_color);
txtDevice->setBackgroundColor(gui_textbox_background_color);
txtDevice->setBackgroundColor(gui_background_color);
txtDevice->setForegroundColor(gui_foreground_color);
lblVolume = new gcn::Label("Volume Label:");
@ -180,7 +180,7 @@ static void InitEditFilesysVirtual()
txtVolume->setSize(120, TEXTFIELD_HEIGHT);
txtVolume->setId("txtVirtVolume");
txtVolume->setBaseColor(gui_base_color);
txtVolume->setBackgroundColor(gui_textbox_background_color);
txtVolume->setBackgroundColor(gui_background_color);
txtVolume->setForegroundColor(gui_foreground_color);
lblPath = new gcn::Label("Path:");
@ -190,7 +190,7 @@ static void InitEditFilesysVirtual()
txtPath->setSize(450, TEXTFIELD_HEIGHT);
txtPath->setId("txtVirtPath");
txtPath->setBaseColor(gui_base_color);
txtPath->setBackgroundColor(gui_textbox_background_color);
txtPath->setBackgroundColor(gui_background_color);
txtPath->setForegroundColor(gui_foreground_color);
cmdVirtSelectDir = new gcn::Button("Select Directory");
@ -210,13 +210,13 @@ static void InitEditFilesysVirtual()
chkReadWrite = new gcn::CheckBox("Read/Write", true);
chkReadWrite->setBaseColor(gui_base_color);
chkReadWrite->setForegroundColor(gui_foreground_color);
chkReadWrite->setBackgroundColor(gui_textbox_background_color);
chkReadWrite->setBackgroundColor(gui_background_color);
chkReadWrite->setId("chkVirtRW");
chkVirtBootable = new gcn::CheckBox("Bootable", true);
chkVirtBootable->setId("chkVirtBootable");
chkVirtBootable->setBaseColor(gui_base_color);
chkVirtBootable->setBackgroundColor(gui_textbox_background_color);
chkVirtBootable->setBackgroundColor(gui_background_color);
chkVirtBootable->setForegroundColor(gui_foreground_color);
chkVirtBootable->addActionListener(filesysVirtualActionListener);
@ -225,7 +225,7 @@ static void InitEditFilesysVirtual()
txtBootPri = new gcn::TextField();
txtBootPri->setSize(45, TEXTFIELD_HEIGHT);
txtBootPri->setBaseColor(gui_base_color);
txtBootPri->setBackgroundColor(gui_textbox_background_color);
txtBootPri->setBackgroundColor(gui_background_color);
txtBootPri->setForegroundColor(gui_foreground_color);
int posY = DISTANCE_BORDER;

6
src/osdep/gui/EditTapeDrive.cpp
View File

@ -155,7 +155,7 @@ static void InitEditTapeDrive()
txtTapeDrivePath->setSize(490, TEXTFIELD_HEIGHT);
txtTapeDrivePath->setId("txtTapeDrivePath");
txtTapeDrivePath->setBaseColor(gui_base_color);
txtTapeDrivePath->setBackgroundColor(gui_textbox_background_color);
txtTapeDrivePath->setBackgroundColor(gui_background_color);
txtTapeDrivePath->setForegroundColor(gui_foreground_color);
cmdTapeDriveSelectDir = new gcn::Button("Select Directory");
@ -177,7 +177,7 @@ static void InitEditTapeDrive()
cboTapeDriveController = new gcn::DropDown(&controllerListModel);
cboTapeDriveController->setSize(180, DROPDOWN_HEIGHT);
cboTapeDriveController->setBaseColor(gui_base_color);
cboTapeDriveController->setBackgroundColor(gui_textbox_background_color);
cboTapeDriveController->setBackgroundColor(gui_background_color);
cboTapeDriveController->setForegroundColor(gui_foreground_color);
cboTapeDriveController->setSelectionColor(gui_selection_color);
cboTapeDriveController->setId("cboTapeDriveController");
@ -186,7 +186,7 @@ static void InitEditTapeDrive()
cboTapeDriveUnit = new gcn::DropDown(&unitListModel);
cboTapeDriveUnit->setSize(60, DROPDOWN_HEIGHT);
cboTapeDriveUnit->setBaseColor(gui_base_color);
cboTapeDriveUnit->setBackgroundColor(gui_textbox_background_color);
cboTapeDriveUnit->setBackgroundColor(gui_background_color);
cboTapeDriveUnit->setForegroundColor(gui_foreground_color);
cboTapeDriveUnit->setSelectionColor(gui_selection_color);
cboTapeDriveUnit->setId("cboTapeDriveUnit");

26
src/osdep/gui/Navigation.cpp
View File

@ -44,13 +44,14 @@ static NavigationMap nav_map[] =
{"Priority", "cboInactiveRunAtPrio", "cboActiveRunAtPrio", "Miscellaneous", "Savestates" },
{"Savestates", "State0", "State0", "Priority", "Virtual Keyboard"},
{"Virtual Keyboard", "chkVkEnabled", "chkVkEnabled", "Savestates", "WHDLoad"},
{"WHDLoad", "cmdWhdloadEject", "cmdWhdloadEject", "Virtual Keyboard", "Quit"},
{"Shutdown", "Start", "Quit", "WHDLoad", "About"},
{"Quit", "Shutdown", "Restart", "WHDLoad", "About"},
{"Restart", "Quit", "Help", "WHDLoad", "About"},
{"Help", "Restart", "Reset", "WHDLoad", "About"},
{"Reset", "Help", "Start", "WHDLoad", "About"},
{"Start", "Reset", "Shutdown", "WHDLoad", "About"},
{"WHDLoad", "cmdWhdloadEject", "cmdWhdloadEject", "Virtual Keyboard", "Themes"},
{"Themes", "cmdThemeSaveAs", "cboThemePreset", "WHDLoad", "Quit"},
{"Shutdown", "Start", "Quit", "Themes", "About"},
{"Quit", "Shutdown", "Restart", "Themes", "About"},
{"Restart", "Quit", "Help", "Themes", "About"},
{"Help", "Restart", "Reset", "Themes", "About"},
{"Reset", "Help", "Start", "Themes", "About"},
{"Start", "Reset", "Shutdown", "Themes", "About"},
// PanelPaths
{"scrlPaths", "cmdSystemROMs", "Paths", "", "" },
@ -592,16 +593,21 @@ static NavigationMap nav_map[] =
{ "cmdWhdloadEject", "WHDLoad", "cmdWhdloadSelect", "chkQuitOnExit", "cboWhdload" },
{ "cmdWhdloadSelect", "cmdWhdloadEject", "WHDLoad", "chkQuitOnExit", "cboWhdload" },
{ "cboWhdload", "WHDLoad", "WHDLoad", "cmdWhdloadSelect", "cboSlaves" },
{ "cboSlaves", "WHDLoad", "WHDLoad", "cboWhdload", "cmdCustomFields" },
{ "cmdCustomFields", "WHDLoad", "WHDLoad", "cboSlaves", "chkButtonWait" },
{ "chkButtonWait", "WHDLoad", "WHDLoad", "cmdCustomFields", "chkShowSplash" },
{ "chkShowSplash", "WHDLoad", "WHDLoad", "chkButtonWait", "chkWriteCache" },
{ "chkWriteCache", "WHDLoad", "WHDLoad", "chkShowSplash", "chkQuitOnExit" },
{ "chkQuitOnExit", "WHDLoad", "WHDLoad", "chkWriteCache", "cmdWhdloadEject" },
// Themes
{ "cboThemePreset", "Themes", "cmdThemeSave", "cmdThemeUse", "cmdThemeFont" },
{ "cmdThemeSave", "cboThemePreset", "cmdThemeSaveAs", "cmdThemeUse", "cmdThemeFont" },
{ "cmdThemeSaveAs", "cmdThemeSave", "Themes", "cmdThemeUse", "cmdThemeFont" },
{ "cmdThemeFont", "Themes", "Themes", "cboThemePreset", "cmdThemeUse" },
{ "cmdThemeUse", "Themes", "cmdThemeReset", "cmdThemeFont", "cboThemePreset" },
{ "cmdThemeReset", "cmdThemeUse", "Themes", "cmdThemeFont", "cboThemePreset" },
// active move left move right move up move down
// EditFilesysVirtual
{ "txtVirtDevice", "", "", "txtVirtPath", "txtVirtVolume" },

2
src/osdep/gui/PanelAbout.cpp
View File

@ -54,7 +54,7 @@ void InitPanelAbout(const config_category& category)
"Dedicated to HeZoR - R.I.P. little brother (1978-2017)\n"
);
textBox->setEditable(false);
textBox->setBackgroundColor(gui_textbox_background_color);
textBox->setBackgroundColor(gui_background_color);
textBox->setBaseColor(gui_base_color);
textBox->setForegroundColor(gui_foreground_color);

68
src/osdep/gui/PanelCPU.cpp
View File

@ -321,65 +321,65 @@ void InitPanelCPU(const struct config_category& category)
optCPU68000 = new gcn::RadioButton("68000", "radiocpugroup");
optCPU68000->setId("optCPU68000");
optCPU68000->setBaseColor(gui_base_color);
optCPU68000->setBackgroundColor(gui_textbox_background_color);
optCPU68000->setBackgroundColor(gui_background_color);
optCPU68000->setForegroundColor(gui_foreground_color);
optCPU68000->addActionListener(cpuActionListener);
optCPU68010 = new gcn::RadioButton("68010", "radiocpugroup");
optCPU68010->setId("optCPU68010");
optCPU68010->setBaseColor(gui_base_color);
optCPU68010->setBackgroundColor(gui_textbox_background_color);
optCPU68010->setBackgroundColor(gui_background_color);
optCPU68010->setForegroundColor(gui_foreground_color);
optCPU68010->addActionListener(cpuActionListener);
optCPU68020 = new gcn::RadioButton("68020", "radiocpugroup");
optCPU68020->setId("optCPU68020");
optCPU68020->setBaseColor(gui_base_color);
optCPU68020->setBackgroundColor(gui_textbox_background_color);
optCPU68020->setBackgroundColor(gui_background_color);
optCPU68020->setForegroundColor(gui_foreground_color);
optCPU68020->addActionListener(cpuActionListener);
optCPU68030 = new gcn::RadioButton("68030", "radiocpugroup");
optCPU68030->setId("optCPU68030");
optCPU68030->setBaseColor(gui_base_color);
optCPU68030->setBackgroundColor(gui_textbox_background_color);
optCPU68030->setBackgroundColor(gui_background_color);
optCPU68030->setForegroundColor(gui_foreground_color);
optCPU68030->addActionListener(cpuActionListener);
optCPU68040 = new gcn::RadioButton("68040", "radiocpugroup");
optCPU68040->setId("optCPU68040");
optCPU68040->setBaseColor(gui_base_color);
optCPU68040->setBackgroundColor(gui_textbox_background_color);
optCPU68040->setBackgroundColor(gui_background_color);
optCPU68040->setForegroundColor(gui_foreground_color);
optCPU68040->addActionListener(cpuActionListener);
optCPU68060 = new gcn::RadioButton("68060", "radiocpugroup");
optCPU68060->setId("optCPU68060");
optCPU68060->setBaseColor(gui_base_color);
optCPU68060->setBackgroundColor(gui_textbox_background_color);
optCPU68060->setBackgroundColor(gui_background_color);
optCPU68060->setForegroundColor(gui_foreground_color);
optCPU68060->addActionListener(cpuActionListener);
chk24Bit = new gcn::CheckBox("24-bit addressing", true);
chk24Bit->setId("chk24Bit");
chk24Bit->setBaseColor(gui_base_color);
chk24Bit->setBackgroundColor(gui_textbox_background_color);
chk24Bit->setBackgroundColor(gui_background_color);
chk24Bit->setForegroundColor(gui_foreground_color);
chk24Bit->addActionListener(cpuActionListener);
chkCPUCompatible = new gcn::CheckBox("More compatible", true);
chkCPUCompatible->setId("chkCPUCompatible");
chkCPUCompatible->setBaseColor(gui_base_color);
chkCPUCompatible->setBackgroundColor(gui_textbox_background_color);
chkCPUCompatible->setBackgroundColor(gui_background_color);
chkCPUCompatible->setForegroundColor(gui_foreground_color);
chkCPUCompatible->addActionListener(cpuActionListener);
chkCpuDataCache = new gcn::CheckBox("Data cache");
chkCpuDataCache->setId("chkCpuDataCache");
chkCpuDataCache->setBaseColor(gui_base_color);
chkCpuDataCache->setBackgroundColor(gui_textbox_background_color);
chkCpuDataCache->setBackgroundColor(gui_background_color);
chkCpuDataCache->setForegroundColor(gui_foreground_color);
chkCpuDataCache->addActionListener(cpuActionListener);
chkJIT = new gcn::CheckBox("JIT", true);
chkJIT->setId("chkJIT");
chkJIT->setBaseColor(gui_base_color);
chkJIT->setBackgroundColor(gui_textbox_background_color);
chkJIT->setBackgroundColor(gui_background_color);
chkJIT->setForegroundColor(gui_foreground_color);
chkJIT->addActionListener(cpuActionListener);
@ -405,19 +405,19 @@ void InitPanelCPU(const struct config_category& category)
optMMUNone = new gcn::RadioButton("None", "radiommugroup");
optMMUNone->setId("optMMUNone");
optMMUNone->setBaseColor(gui_base_color);
optMMUNone->setBackgroundColor(gui_textbox_background_color);
optMMUNone->setBackgroundColor(gui_background_color);
optMMUNone->setForegroundColor(gui_foreground_color);
optMMUNone->addActionListener(cpuActionListener);
optMMUEnabled = new gcn::RadioButton("MMU", "radiommugroup");
optMMUEnabled->setId("optMMUEnabled");
optMMUEnabled->setBaseColor(gui_base_color);
optMMUEnabled->setBackgroundColor(gui_textbox_background_color);
optMMUEnabled->setBackgroundColor(gui_background_color);
optMMUEnabled->setForegroundColor(gui_foreground_color);
optMMUEnabled->addActionListener(cpuActionListener);
optMMUEC = new gcn::RadioButton("EC", "radiommugroup");
optMMUEC->setId("optMMUEC");
optMMUEC->setBaseColor(gui_base_color);
optMMUEC->setBackgroundColor(gui_textbox_background_color);
optMMUEC->setBackgroundColor(gui_background_color);
optMMUEC->setForegroundColor(gui_foreground_color);
optMMUEC->addActionListener(cpuActionListener);
@ -436,35 +436,35 @@ void InitPanelCPU(const struct config_category& category)
optFPUnone = new gcn::RadioButton("None", "radiofpugroup");
optFPUnone->setId("optFPUnone");
optFPUnone->setBaseColor(gui_base_color);
optFPUnone->setBackgroundColor(gui_textbox_background_color);
optFPUnone->setBackgroundColor(gui_background_color);
optFPUnone->setForegroundColor(gui_foreground_color);
optFPUnone->addActionListener(cpuActionListener);
optFPU68881 = new gcn::RadioButton("68881", "radiofpugroup");
optFPU68881->setId("optFPU68881");
optFPU68881->setBaseColor(gui_base_color);
optFPU68881->setBackgroundColor(gui_textbox_background_color);
optFPU68881->setBackgroundColor(gui_background_color);
optFPU68881->setForegroundColor(gui_foreground_color);
optFPU68881->addActionListener(cpuActionListener);
optFPU68882 = new gcn::RadioButton("68882", "radiofpugroup");
optFPU68882->setId("optFPU68882");
optFPU68882->setBaseColor(gui_base_color);
optFPU68882->setBackgroundColor(gui_textbox_background_color);
optFPU68882->setBackgroundColor(gui_background_color);
optFPU68882->setForegroundColor(gui_foreground_color);
optFPU68882->addActionListener(cpuActionListener);
optFPUinternal = new gcn::RadioButton("CPU internal", "radiofpugroup");
optFPUinternal->setId("optFPUinternal");
optFPUinternal->setBaseColor(gui_base_color);
optFPUinternal->setBackgroundColor(gui_textbox_background_color);
optFPUinternal->setBackgroundColor(gui_background_color);
optFPUinternal->setForegroundColor(gui_foreground_color);
optFPUinternal->addActionListener(cpuActionListener);
chkFPUStrict = new gcn::CheckBox("More compatible", true);
chkFPUStrict->setId("chkFPUStrict");
chkFPUStrict->setBaseColor(gui_base_color);
chkFPUStrict->setBackgroundColor(gui_textbox_background_color);
chkFPUStrict->setBackgroundColor(gui_background_color);
chkFPUStrict->setForegroundColor(gui_foreground_color);
chkFPUStrict->addActionListener(cpuActionListener);
@ -485,14 +485,14 @@ void InitPanelCPU(const struct config_category& category)
optCPUSpeedFastest = new gcn::RadioButton("Fastest Possible", "radiocpuspeedgroup");
optCPUSpeedFastest->setId("optCPUSpeedFastest");
optCPUSpeedFastest->setBaseColor(gui_base_color);
optCPUSpeedFastest->setBackgroundColor(gui_textbox_background_color);
optCPUSpeedFastest->setBackgroundColor(gui_background_color);
optCPUSpeedFastest->setForegroundColor(gui_foreground_color);
optCPUSpeedFastest->addActionListener(cpuActionListener);
optCPUSpeedReal = new gcn::RadioButton("A500/A1200 or cycle exact", "radiocpuspeedgroup");
optCPUSpeedReal->setId("optCPUSpeedReal");
optCPUSpeedReal->setBaseColor(gui_base_color);
optCPUSpeedReal->setBackgroundColor(gui_textbox_background_color);
optCPUSpeedReal->setBackgroundColor(gui_background_color);
optCPUSpeedReal->setForegroundColor(gui_foreground_color);
optCPUSpeedReal->addActionListener(cpuActionListener);
@ -500,7 +500,7 @@ void InitPanelCPU(const struct config_category& category)
sldCpuSpeed = new gcn::Slider(-9, 50);
sldCpuSpeed->setSize(320, SLIDER_HEIGHT);
sldCpuSpeed->setBaseColor(gui_base_color);
sldCpuSpeed->setBackgroundColor(gui_textbox_background_color);
sldCpuSpeed->setBackgroundColor(gui_background_color);
sldCpuSpeed->setForegroundColor(gui_foreground_color);
sldCpuSpeed->setMarkerLength(20);
sldCpuSpeed->setStepLength(1);
@ -512,7 +512,7 @@ void InitPanelCPU(const struct config_category& category)
sldCpuIdle = new gcn::Slider(0, 10);
sldCpuIdle->setSize(90, SLIDER_HEIGHT);
sldCpuIdle->setBaseColor(gui_base_color);
sldCpuIdle->setBackgroundColor(gui_textbox_background_color);
sldCpuIdle->setBackgroundColor(gui_background_color);
sldCpuIdle->setForegroundColor(gui_foreground_color);
sldCpuIdle->setMarkerLength(20);
sldCpuIdle->setStepLength(1);
@ -542,7 +542,7 @@ void InitPanelCPU(const struct config_category& category)
cboCPUFrequency = new gcn::DropDown(&cpu_freq_list);
cboCPUFrequency->setSize(100, cboCPUFrequency->getHeight());
cboCPUFrequency->setBaseColor(gui_base_color);
cboCPUFrequency->setBackgroundColor(gui_textbox_background_color);
cboCPUFrequency->setBackgroundColor(gui_background_color);
cboCPUFrequency->setForegroundColor(gui_foreground_color);
cboCPUFrequency->setSelectionColor(gui_selection_color);
cboCPUFrequency->addActionListener(cpuActionListener);
@ -552,7 +552,7 @@ void InitPanelCPU(const struct config_category& category)
chkCPUMultiThread = new gcn::CheckBox("Multi-threaded CPU");
chkCPUMultiThread->setId("chkCPUMultiThread");
chkCPUMultiThread->setBaseColor(gui_base_color);
chkCPUMultiThread->setBackgroundColor(gui_textbox_background_color);
chkCPUMultiThread->setBackgroundColor(gui_background_color);
chkCPUMultiThread->setForegroundColor(gui_foreground_color);
chkCPUMultiThread->addActionListener(cpuActionListener);
@ -573,7 +573,7 @@ void InitPanelCPU(const struct config_category& category)
chkPPCEnabled = new gcn::CheckBox("PPC emulation (Blizzard PPC/CyberStorm PPC)", false);
chkPPCEnabled->setId("chkPPCEnabled");
chkPPCEnabled->setBaseColor(gui_base_color);
chkPPCEnabled->setBackgroundColor(gui_textbox_background_color);
chkPPCEnabled->setBackgroundColor(gui_background_color);
chkPPCEnabled->setForegroundColor(gui_foreground_color);
chkPPCEnabled->addActionListener(cpuActionListener);
@ -581,7 +581,7 @@ void InitPanelCPU(const struct config_category& category)
sldPPCIdle = new gcn::Slider(0, 10);
sldPPCIdle->setSize(90, SLIDER_HEIGHT);
sldPPCIdle->setBaseColor(gui_base_color);
sldPPCIdle->setBackgroundColor(gui_textbox_background_color);
sldPPCIdle->setBackgroundColor(gui_background_color);
sldPPCIdle->setForegroundColor(gui_foreground_color);
sldPPCIdle->setMarkerLength(20);
sldPPCIdle->setStepLength(1);
@ -607,7 +607,7 @@ void InitPanelCPU(const struct config_category& category)
sldJitCacheSize = new gcn::Slider(0, 5);
sldJitCacheSize->setSize(150, SLIDER_HEIGHT);
sldJitCacheSize->setBaseColor(gui_base_color);
sldJitCacheSize->setBackgroundColor(gui_textbox_background_color);
sldJitCacheSize->setBackgroundColor(gui_background_color);
sldJitCacheSize->setForegroundColor(gui_foreground_color);
sldJitCacheSize->setMarkerLength(20);
sldJitCacheSize->setStepLength(1);
@ -618,43 +618,43 @@ void InitPanelCPU(const struct config_category& category)
chkFPUJIT = new gcn::CheckBox("FPU Support", true);
chkFPUJIT->setId("chkFPUJIT");
chkFPUJIT->setBaseColor(gui_base_color);
chkFPUJIT->setBackgroundColor(gui_textbox_background_color);
chkFPUJIT->setBackgroundColor(gui_background_color);
chkFPUJIT->setForegroundColor(gui_foreground_color);
chkFPUJIT->addActionListener(cpuActionListener);
chkConstantJump = new gcn::CheckBox("Constant jump");
chkConstantJump->setId("chkConstantJump");
chkConstantJump->setBaseColor(gui_base_color);
chkConstantJump->setBackgroundColor(gui_textbox_background_color);
chkConstantJump->setBackgroundColor(gui_background_color);
chkConstantJump->setForegroundColor(gui_foreground_color);
chkConstantJump->addActionListener(cpuActionListener);
chkHardFlush = new gcn::CheckBox("Hard flush");
chkHardFlush->setId("chkHardFlush");
chkHardFlush->setBaseColor(gui_base_color);
chkHardFlush->setBackgroundColor(gui_textbox_background_color);
chkHardFlush->setBackgroundColor(gui_background_color);
chkHardFlush->setForegroundColor(gui_foreground_color);
chkHardFlush->addActionListener(cpuActionListener);
optDirect = new gcn::RadioButton("Direct", "radiomemaccessgroup");
optDirect->setId("optDirect");
optDirect->setBaseColor(gui_base_color);
optDirect->setBackgroundColor(gui_textbox_background_color);
optDirect->setBackgroundColor(gui_background_color);
optDirect->setForegroundColor(gui_foreground_color);
optDirect->addActionListener(cpuActionListener);
optIndirect = new gcn::RadioButton("Indirect", "radiomemaccessgroup");
optIndirect->setId("optIndirect");
optIndirect->setBaseColor(gui_base_color);
optIndirect->setBackgroundColor(gui_textbox_background_color);
optIndirect->setBackgroundColor(gui_background_color);
optIndirect->setForegroundColor(gui_foreground_color);
optIndirect->addActionListener(cpuActionListener);
chkNoFlags = new gcn::CheckBox("No flags");
chkNoFlags->setId("chkNoFlags");
chkNoFlags->setBaseColor(gui_base_color);
chkNoFlags->setBackgroundColor(gui_textbox_background_color);
chkNoFlags->setBackgroundColor(gui_background_color);
chkNoFlags->setForegroundColor(gui_foreground_color);
chkNoFlags->addActionListener(cpuActionListener);
chkCatchExceptions = new gcn::CheckBox("Catch unexpected exceptions");
chkCatchExceptions->setId("chkCatchExceptions");
chkCatchExceptions->setBaseColor(gui_base_color);
chkCatchExceptions->setBackgroundColor(gui_textbox_background_color);
chkCatchExceptions->setBackgroundColor(gui_background_color);
chkCatchExceptions->setForegroundColor(gui_foreground_color);
chkCatchExceptions->addActionListener(cpuActionListener);

38
src/osdep/gui/PanelChipset.cpp
View File

@ -179,56 +179,56 @@ void InitPanelChipset(const struct config_category& category)
optOCS = new gcn::RadioButton("OCS", "radiochipsetgroup");
optOCS->setId("optOCS");
optOCS->setBaseColor(gui_base_color);
optOCS->setBackgroundColor(gui_textbox_background_color);
optOCS->setBackgroundColor(gui_background_color);
optOCS->setForegroundColor(gui_foreground_color);
optOCS->addActionListener(chipsetActionListener);
optECSAgnus = new gcn::RadioButton("ECS Agnus", "radiochipsetgroup");
optECSAgnus->setId("optECSAgnus");
optECSAgnus->setBaseColor(gui_base_color);
optECSAgnus->setBackgroundColor(gui_textbox_background_color);
optECSAgnus->setBackgroundColor(gui_background_color);
optECSAgnus->setForegroundColor(gui_foreground_color);
optECSAgnus->addActionListener(chipsetActionListener);
optECSDenise = new gcn::RadioButton("ECS Denise", "radiochipsetgroup");
optECSDenise->setId("optECSDenise");
optECSDenise->setBaseColor(gui_base_color);
optECSDenise->setBackgroundColor(gui_textbox_background_color);
optECSDenise->setBackgroundColor(gui_background_color);
optECSDenise->setForegroundColor(gui_foreground_color);
optECSDenise->addActionListener(chipsetActionListener);
optECS = new gcn::RadioButton("Full ECS", "radiochipsetgroup");
optECS->setId("optFullECS");
optECS->setBaseColor(gui_base_color);
optECS->setBackgroundColor(gui_textbox_background_color);
optECS->setBackgroundColor(gui_background_color);
optECS->setForegroundColor(gui_foreground_color);
optECS->addActionListener(chipsetActionListener);
optAGA = new gcn::RadioButton("AGA", "radiochipsetgroup");
optAGA->setId("optAGA");
optAGA->setBaseColor(gui_base_color);
optAGA->setBackgroundColor(gui_textbox_background_color);
optAGA->setBackgroundColor(gui_background_color);
optAGA->setForegroundColor(gui_foreground_color);
optAGA->addActionListener(chipsetActionListener);
chkNTSC = new gcn::CheckBox("NTSC");
chkNTSC->setId("chkNTSC");
chkNTSC->setBaseColor(gui_base_color);
chkNTSC->setBackgroundColor(gui_textbox_background_color);
chkNTSC->setBackgroundColor(gui_background_color);
chkNTSC->setForegroundColor(gui_foreground_color);
chkNTSC->addActionListener(chipsetActionListener);
chkCycleExact = new gcn::CheckBox("Cycle Exact (Full)");
chkCycleExact->setId("chkCycleExact");
chkCycleExact->setBaseColor(gui_base_color);
chkCycleExact->setBackgroundColor(gui_textbox_background_color);
chkCycleExact->setBackgroundColor(gui_background_color);
chkCycleExact->setForegroundColor(gui_foreground_color);
chkCycleExact->addActionListener(chipsetActionListener);
chkMemoryCycleExact = new gcn::CheckBox("Cycle Exact (DMA/Memory)");
chkMemoryCycleExact->setId("chkMemoryCycleExact");
chkMemoryCycleExact->setBaseColor(gui_base_color);
chkMemoryCycleExact->setBackgroundColor(gui_textbox_background_color);
chkMemoryCycleExact->setBackgroundColor(gui_background_color);
chkMemoryCycleExact->setForegroundColor(gui_foreground_color);
chkMemoryCycleExact->addActionListener(chipsetActionListener);
@ -237,7 +237,7 @@ void InitPanelChipset(const struct config_category& category)
cboChipset = new gcn::DropDown(&chipsetList);
cboChipset->setSize(120, cboChipset->getHeight());
cboChipset->setBaseColor(gui_base_color);
cboChipset->setBackgroundColor(gui_textbox_background_color);
cboChipset->setBackgroundColor(gui_background_color);
cboChipset->setForegroundColor(gui_foreground_color);
cboChipset->setSelectionColor(gui_selection_color);
cboChipset->setId("cboChipset");
@ -267,35 +267,35 @@ void InitPanelChipset(const struct config_category& category)
chkKeyboardConnected = new gcn::CheckBox("Keyboard connected");
chkKeyboardConnected->setId("chkKeyboardConnected");
chkKeyboardConnected->setBaseColor(gui_base_color);
chkKeyboardConnected->setBackgroundColor(gui_textbox_background_color);
chkKeyboardConnected->setBackgroundColor(gui_background_color);
chkKeyboardConnected->setForegroundColor(gui_foreground_color);
chkKeyboardConnected->addActionListener(chipsetActionListener);
chkSubpixelEmu = new gcn::CheckBox("Subpixel Display emulation");
chkSubpixelEmu->setId("chkSubpixelEmu");
chkSubpixelEmu->setBaseColor(gui_base_color);
chkSubpixelEmu->setBackgroundColor(gui_textbox_background_color);
chkSubpixelEmu->setBackgroundColor(gui_background_color);
chkSubpixelEmu->setForegroundColor(gui_foreground_color);
chkSubpixelEmu->addActionListener(chipsetActionListener);
chkBlitImmed = new gcn::CheckBox("Immediate Blitter");
chkBlitImmed->setId("chkBlitImmed");
chkBlitImmed->setBaseColor(gui_base_color);
chkBlitImmed->setBackgroundColor(gui_textbox_background_color);
chkBlitImmed->setBackgroundColor(gui_background_color);
chkBlitImmed->setForegroundColor(gui_foreground_color);
chkBlitImmed->addActionListener(chipsetActionListener);
chkBlitWait = new gcn::CheckBox("Wait for Blitter");
chkBlitWait->setId("chkBlitWait");
chkBlitWait->setBaseColor(gui_base_color);
chkBlitWait->setBackgroundColor(gui_textbox_background_color);
chkBlitWait->setBackgroundColor(gui_background_color);
chkBlitWait->setForegroundColor(gui_foreground_color);
chkBlitWait->addActionListener(chipsetActionListener);
chkMultithreadedDrawing = new gcn::CheckBox("Multithreaded Drawing");
chkMultithreadedDrawing->setId("chkMultithreadedDrawing");
chkMultithreadedDrawing->setBaseColor(gui_base_color);
chkMultithreadedDrawing->setBackgroundColor(gui_textbox_background_color);
chkMultithreadedDrawing->setBackgroundColor(gui_background_color);
chkMultithreadedDrawing->setForegroundColor(gui_foreground_color);
chkMultithreadedDrawing->addActionListener(chipsetActionListener);
@ -304,7 +304,7 @@ void InitPanelChipset(const struct config_category& category)
cboSpecialMonitors = new gcn::DropDown(&specialMonitorsList);
cboSpecialMonitors->setSize(lblSpecialMonitors->getWidth(), cboSpecialMonitors->getHeight());
cboSpecialMonitors->setBaseColor(gui_base_color);
cboSpecialMonitors->setBackgroundColor(gui_textbox_background_color);
cboSpecialMonitors->setBackgroundColor(gui_background_color);
cboSpecialMonitors->setForegroundColor(gui_foreground_color);
cboSpecialMonitors->setSelectionColor(gui_selection_color);
cboSpecialMonitors->setId("cboSpecialMonitors");
@ -331,28 +331,28 @@ void InitPanelChipset(const struct config_category& category)
optCollNone = new gcn::RadioButton("None", "radioccollisiongroup");
optCollNone->setId("optCollNone");
optCollNone->setBaseColor(gui_base_color);
optCollNone->setBackgroundColor(gui_textbox_background_color);
optCollNone->setBackgroundColor(gui_background_color);
optCollNone->setForegroundColor(gui_foreground_color);
optCollNone->addActionListener(chipsetActionListener);
optCollSprites = new gcn::RadioButton("Sprites only", "radioccollisiongroup");
optCollSprites->setId("optCollSprites");
optCollSprites->setBaseColor(gui_base_color);
optCollSprites->setBackgroundColor(gui_textbox_background_color);
optCollSprites->setBackgroundColor(gui_background_color);
optCollSprites->setForegroundColor(gui_foreground_color);
optCollSprites->addActionListener(chipsetActionListener);
optCollPlayfield = new gcn::RadioButton("Sprites and Sprites vs. Playfield", "radioccollisiongroup");
optCollPlayfield->setId("optCollPlayfield");
optCollPlayfield->setBaseColor(gui_base_color);
optCollPlayfield->setBackgroundColor(gui_textbox_background_color);
optCollPlayfield->setBackgroundColor(gui_background_color);
optCollPlayfield->setForegroundColor(gui_foreground_color);
optCollPlayfield->addActionListener(chipsetActionListener);
optCollFull = new gcn::RadioButton("Full (rarely needed)", "radioccollisiongroup");
optCollFull->setId("optCollFull");
optCollFull->setBaseColor(gui_base_color);
optCollFull->setBackgroundColor(gui_textbox_background_color);
optCollFull->setBackgroundColor(gui_background_color);
optCollFull->setForegroundColor(gui_foreground_color);
optCollFull->addActionListener(chipsetActionListener);

8
src/osdep/gui/PanelConfig.cpp
View File

@ -175,7 +175,7 @@ void InitPanelConfig(const struct config_category& category)
txtName = new gcn::TextField();
txtName->setSize(300, TEXTFIELD_HEIGHT);
txtName->setBaseColor(gui_base_color);
txtName->setBackgroundColor(gui_textbox_background_color);
txtName->setBackgroundColor(gui_background_color);
txtName->setForegroundColor(gui_foreground_color);
lblDesc = new gcn::Label("Description:");
@ -184,7 +184,7 @@ void InitPanelConfig(const struct config_category& category)
txtDesc = new gcn::TextField();
txtDesc->setSize(300, TEXTFIELD_HEIGHT);
txtDesc->setBaseColor(gui_base_color);
txtDesc->setBackgroundColor(gui_textbox_background_color);
txtDesc->setBackgroundColor(gui_background_color);
txtDesc->setForegroundColor(gui_foreground_color);
cmdLoad = new gcn::Button("Load");
@ -213,7 +213,7 @@ void InitPanelConfig(const struct config_category& category)
lstConfigs = new gcn::ListBox(&configsList);
lstConfigs->setSize(list_width, list_height);
lstConfigs->setBaseColor(gui_base_color);
lstConfigs->setBackgroundColor(gui_textbox_background_color);
lstConfigs->setBackgroundColor(gui_background_color);
lstConfigs->setForegroundColor(gui_foreground_color);
lstConfigs->setSelectionColor(gui_selection_color);
lstConfigs->setWrappingEnabled(true);
@ -225,7 +225,7 @@ void InitPanelConfig(const struct config_category& category)
scrAreaConfigs->setPosition(DISTANCE_BORDER, DISTANCE_BORDER);
scrAreaConfigs->setSize(lstConfigs->getWidth() + SCROLLBAR_WIDTH, lstConfigs->getHeight() + DISTANCE_NEXT_Y);
scrAreaConfigs->setScrollbarWidth(SCROLLBAR_WIDTH);
scrAreaConfigs->setBackgroundColor(gui_textbox_background_color);
scrAreaConfigs->setBackgroundColor(gui_background_color);
scrAreaConfigs->setForegroundColor(gui_foreground_color);
scrAreaConfigs->setBaseColor(gui_base_color);
scrAreaConfigs->setSelectionColor(gui_selection_color);

20
src/osdep/gui/PanelCustom.cpp
View File

@ -195,38 +195,38 @@ void InitPanelCustom(const config_category& category)
optPort0 = new gcn::RadioButton("0: Mouse", "radioportgroup");
optPort0->setId("0: Mouse");
optPort0->setBaseColor(gui_base_color);
optPort0->setBackgroundColor(gui_textbox_background_color);
optPort0->setBackgroundColor(gui_background_color);
optPort0->setForegroundColor(gui_foreground_color);
optPort0->addActionListener(grpActionListener);
optPort1 = new gcn::RadioButton("1: Joystick", "radioportgroup");
optPort1->setId("1: Joystick");
optPort1->setBaseColor(gui_base_color);
optPort1->setBackgroundColor(gui_textbox_background_color);
optPort1->setBackgroundColor(gui_background_color);
optPort1->setForegroundColor(gui_foreground_color);
optPort1->addActionListener(grpActionListener);
optPort2 = new gcn::RadioButton("2: Parallel 1", "radioportgroup");
optPort2->setId("2: Parallel 1");
optPort2->setBaseColor(gui_base_color);
optPort2->setBackgroundColor(gui_textbox_background_color);
optPort2->setBackgroundColor(gui_background_color);
optPort2->setForegroundColor(gui_foreground_color);
optPort2->addActionListener(grpActionListener);
optPort3 = new gcn::RadioButton("3: Parallel 2", "radioportgroup");
optPort3->setId("3: Parallel 2");
optPort3->setBaseColor(gui_base_color);
optPort3->setBackgroundColor(gui_textbox_background_color);
optPort3->setBackgroundColor(gui_background_color);
optPort3->setForegroundColor(gui_foreground_color);
optPort3->addActionListener(grpActionListener);
optMultiNone = new gcn::RadioButton("None", "radiomultigroup");
optMultiNone->setId("None");
optMultiNone->setBaseColor(gui_base_color);
optMultiNone->setBackgroundColor(gui_textbox_background_color);
optMultiNone->setBackgroundColor(gui_background_color);
optMultiNone->setForegroundColor(gui_foreground_color);
optMultiNone->addActionListener(grpActionListener);
optMultiSelect = new gcn::RadioButton("HotKey", "radiomultigroup");
optMultiSelect->setId("HotKey");
optMultiSelect->setBaseColor(gui_base_color);
optMultiSelect->setBackgroundColor(gui_textbox_background_color);
optMultiSelect->setBackgroundColor(gui_background_color);
optMultiSelect->setForegroundColor(gui_foreground_color);
optMultiSelect->addActionListener(grpActionListener);
@ -250,7 +250,7 @@ void InitPanelCustom(const config_category& category)
txtSetHotkey->setEnabled(false);
txtSetHotkey->setSize(120, TEXTFIELD_HEIGHT);
txtSetHotkey->setBaseColor(gui_base_color);
txtSetHotkey->setBackgroundColor(gui_textbox_background_color);
txtSetHotkey->setBackgroundColor(gui_background_color);
txtSetHotkey->setForegroundColor(gui_foreground_color);
cmdSetHotkey = new gcn::Button("...");
cmdSetHotkey->setId("cmdSetHotkey");
@ -281,7 +281,7 @@ void InitPanelCustom(const config_category& category)
txtPortInput = new gcn::TextField();
txtPortInput->setEnabled(false);
txtPortInput->setBaseColor(gui_base_color);
txtPortInput->setBackgroundColor(gui_textbox_background_color);
txtPortInput->setBackgroundColor(gui_background_color);
txtPortInput->setForegroundColor(gui_foreground_color);
lblRetroarch = new gcn::Label("[-]");
@ -306,7 +306,7 @@ void InitPanelCustom(const config_category& category)
cboCustomButtonAction[i] = new gcn::DropDown(&CustomEventList);
cboCustomButtonAction[i]->setSize(cboCustomButtonAction[i]->getWidth() * 2, cboCustomButtonAction[i]->getHeight());
cboCustomButtonAction[i]->setBaseColor(gui_base_color);
cboCustomButtonAction[i]->setBackgroundColor(gui_textbox_background_color);
cboCustomButtonAction[i]->setBackgroundColor(gui_background_color);
cboCustomButtonAction[i]->setForegroundColor(gui_foreground_color);
cboCustomButtonAction[i]->setSelectionColor(gui_selection_color);
@ -324,7 +324,7 @@ void InitPanelCustom(const config_category& category)
cboCustomAxisAction[i] = new gcn::DropDown(&CustomEventList);
cboCustomAxisAction[i]->setSize(cboCustomAxisAction[i]->getWidth() * 2, cboCustomAxisAction[i]->getHeight());
cboCustomAxisAction[i]->setBaseColor(gui_base_color);
cboCustomAxisAction[i]->setBackgroundColor(gui_textbox_background_color);
cboCustomAxisAction[i]->setBackgroundColor(gui_background_color);
cboCustomAxisAction[i]->setForegroundColor(gui_foreground_color);
cboCustomAxisAction[i]->setSelectionColor(gui_selection_color);

2
src/osdep/gui/PanelDiskSwapper.cpp
View File

@ -269,7 +269,7 @@ void InitPanelDiskSwapper(const config_category& category)
diskSwapperListCells[row][column]->setSize(diskswapper_column_size[column], SMALL_BUTTON_HEIGHT);
diskSwapperListCells[row][column]->setEnabled(false);
diskSwapperListCells[row][column]->setBaseColor(gui_base_color);
diskSwapperListCells[row][column]->setBackgroundColor(gui_textbox_background_color);
diskSwapperListCells[row][column]->setBackgroundColor(gui_background_color);
diskSwapperListCells[row][column]->setForegroundColor(gui_foreground_color);
if (column == 0)
diskSwapperListCells[row][column]->setText(std::to_string(row + 1));

76
src/osdep/gui/PanelDisplay.cpp
View File

@ -562,7 +562,7 @@ void InitPanelDisplay(const config_category& category)
cboFullscreen = new gcn::DropDown(&fullscreen_resolutions_list);
cboFullscreen->setSize(150, cboFullscreen->getHeight());
cboFullscreen->setBaseColor(gui_base_color);
cboFullscreen->setBackgroundColor(gui_textbox_background_color);
cboFullscreen->setBackgroundColor(gui_background_color);
cboFullscreen->setForegroundColor(gui_foreground_color);
cboFullscreen->setSelectionColor(gui_selection_color);
cboFullscreen->setId("cboFullscreen");
@ -571,7 +571,7 @@ void InitPanelDisplay(const config_category& category)
chkManualCrop = new gcn::CheckBox("Manual Crop");
chkManualCrop->setId("chkManualCrop");
chkManualCrop->setBaseColor(gui_base_color);
chkManualCrop->setBackgroundColor(gui_textbox_background_color);
chkManualCrop->setBackgroundColor(gui_background_color);
chkManualCrop->setForegroundColor(gui_foreground_color);
chkManualCrop->addActionListener(amigaScreenActionListener);
@ -580,7 +580,7 @@ void InitPanelDisplay(const config_category& category)
sldAmigaWidth = new gcn::Slider(0, AMIGAWIDTH_COUNT - 1);
sldAmigaWidth->setSize(180, SLIDER_HEIGHT);
sldAmigaWidth->setBaseColor(gui_base_color);
sldAmigaWidth->setBackgroundColor(gui_textbox_background_color);
sldAmigaWidth->setBackgroundColor(gui_background_color);
sldAmigaWidth->setForegroundColor(gui_foreground_color);
sldAmigaWidth->setMarkerLength(20);
sldAmigaWidth->setStepLength(1);
@ -590,7 +590,7 @@ void InitPanelDisplay(const config_category& category)
txtAmigaWidth = new gcn::TextField();
txtAmigaWidth->setSize(35, TEXTFIELD_HEIGHT);
txtAmigaWidth->setBaseColor(gui_base_color);
txtAmigaWidth->setBackgroundColor(gui_textbox_background_color);
txtAmigaWidth->setBackgroundColor(gui_background_color);
txtAmigaWidth->setForegroundColor(gui_foreground_color);
txtAmigaWidth->addActionListener(amigaScreenActionListener);
@ -599,7 +599,7 @@ void InitPanelDisplay(const config_category& category)
sldAmigaHeight = new gcn::Slider(0, AMIGAHEIGHT_COUNT - 1);
sldAmigaHeight->setSize(180, SLIDER_HEIGHT);
sldAmigaHeight->setBaseColor(gui_base_color);
sldAmigaHeight->setBackgroundColor(gui_textbox_background_color);
sldAmigaHeight->setBackgroundColor(gui_background_color);
sldAmigaHeight->setForegroundColor(gui_foreground_color);
sldAmigaHeight->setMarkerLength(20);
sldAmigaHeight->setStepLength(1);
@ -609,21 +609,21 @@ void InitPanelDisplay(const config_category& category)
txtAmigaHeight = new gcn::TextField();
txtAmigaHeight->setSize(35, TEXTFIELD_HEIGHT);
txtAmigaHeight->setBaseColor(gui_base_color);
txtAmigaHeight->setBackgroundColor(gui_textbox_background_color);
txtAmigaHeight->setBackgroundColor(gui_background_color);
txtAmigaHeight->setForegroundColor(gui_foreground_color);
txtAmigaHeight->addActionListener(amigaScreenActionListener);
chkAutoCrop = new gcn::CheckBox("Auto Crop");
chkAutoCrop->setId("chkAutoCrop");
chkAutoCrop->setBaseColor(gui_base_color);
chkAutoCrop->setBackgroundColor(gui_textbox_background_color);
chkAutoCrop->setBackgroundColor(gui_background_color);
chkAutoCrop->setForegroundColor(gui_foreground_color);
chkAutoCrop->addActionListener(amigaScreenActionListener);
chkBorderless = new gcn::CheckBox("Borderless");
chkBorderless->setId("chkBorderless");
chkBorderless->setBaseColor(gui_base_color);
chkBorderless->setBackgroundColor(gui_textbox_background_color);
chkBorderless->setBackgroundColor(gui_background_color);
chkBorderless->setForegroundColor(gui_foreground_color);
chkBorderless->addActionListener(amigaScreenActionListener);
@ -632,7 +632,7 @@ void InitPanelDisplay(const config_category& category)
cboVSyncNative = new gcn::DropDown(&vsync_options_list);
cboVSyncNative->setSize(150, cboVSyncNative->getHeight());
cboVSyncNative->setBaseColor(gui_base_color);
cboVSyncNative->setBackgroundColor(gui_textbox_background_color);
cboVSyncNative->setBackgroundColor(gui_background_color);
cboVSyncNative->setForegroundColor(gui_foreground_color);
cboVSyncNative->setSelectionColor(gui_selection_color);
cboVSyncNative->setId("cboVSyncNative");
@ -643,7 +643,7 @@ void InitPanelDisplay(const config_category& category)
cboVSyncRtg = new gcn::DropDown(&vsync_options_list);
cboVSyncRtg->setSize(150, cboVSyncRtg->getHeight());
cboVSyncRtg->setBaseColor(gui_base_color);
cboVSyncRtg->setBackgroundColor(gui_textbox_background_color);
cboVSyncRtg->setBackgroundColor(gui_background_color);
cboVSyncRtg->setForegroundColor(gui_foreground_color);
cboVSyncRtg->setSelectionColor(gui_selection_color);
cboVSyncRtg->setId("cboVSyncRtg");
@ -654,7 +654,7 @@ void InitPanelDisplay(const config_category& category)
sldHOffset = new gcn::Slider(-80, 80);
sldHOffset->setSize(200, SLIDER_HEIGHT);
sldHOffset->setBaseColor(gui_base_color);
sldHOffset->setBackgroundColor(gui_textbox_background_color);
sldHOffset->setBackgroundColor(gui_background_color);
sldHOffset->setForegroundColor(gui_foreground_color);
sldHOffset->setMarkerLength(20);
sldHOffset->setStepLength(1);
@ -668,7 +668,7 @@ void InitPanelDisplay(const config_category& category)
sldVOffset = new gcn::Slider(-80, 80);
sldVOffset->setSize(200, SLIDER_HEIGHT);
sldVOffset->setBaseColor(gui_base_color);
sldVOffset->setBackgroundColor(gui_textbox_background_color);
sldVOffset->setBackgroundColor(gui_background_color);
sldVOffset->setForegroundColor(gui_foreground_color);
sldVOffset->setMarkerLength(20);
sldVOffset->setStepLength(1);
@ -680,55 +680,55 @@ void InitPanelDisplay(const config_category& category)
chkHorizontal = new gcn::CheckBox("Horizontal");
chkHorizontal->setId("chkHorizontal");
chkHorizontal->setBaseColor(gui_base_color);
chkHorizontal->setBackgroundColor(gui_textbox_background_color);
chkHorizontal->setBackgroundColor(gui_background_color);
chkHorizontal->setForegroundColor(gui_foreground_color);
chkHorizontal->addActionListener(amigaScreenActionListener);
chkVertical = new gcn::CheckBox("Vertical");
chkVertical->setId("chkVertical");
chkVertical->setBaseColor(gui_base_color);
chkVertical->setBackgroundColor(gui_textbox_background_color);
chkVertical->setBackgroundColor(gui_background_color);
chkVertical->setForegroundColor(gui_foreground_color);
chkVertical->addActionListener(amigaScreenActionListener);
chkFlickerFixer = new gcn::CheckBox("Remove interlace artifacts");
chkFlickerFixer->setId("chkFlickerFixer");
chkFlickerFixer->setBaseColor(gui_base_color);
chkFlickerFixer->setBackgroundColor(gui_textbox_background_color);
chkFlickerFixer->setBackgroundColor(gui_background_color);
chkFlickerFixer->setForegroundColor(gui_foreground_color);
chkFlickerFixer->addActionListener(amigaScreenActionListener);
chkFilterLowRes = new gcn::CheckBox("Filtered Low Res");
chkFilterLowRes->setId("chkFilterLowRes");
chkFilterLowRes->setBaseColor(gui_base_color);
chkFilterLowRes->setBackgroundColor(gui_textbox_background_color);
chkFilterLowRes->setBackgroundColor(gui_background_color);
chkFilterLowRes->setForegroundColor(gui_foreground_color);
chkFilterLowRes->addActionListener(amigaScreenActionListener);
chkBlackerThanBlack = new gcn::CheckBox("Blacker than black");
chkBlackerThanBlack->setId("chkBlackerThanBlack");
chkBlackerThanBlack->setBaseColor(gui_base_color);
chkBlackerThanBlack->setBackgroundColor(gui_textbox_background_color);
chkBlackerThanBlack->setBackgroundColor(gui_background_color);
chkBlackerThanBlack->setForegroundColor(gui_foreground_color);
chkBlackerThanBlack->addActionListener(amigaScreenActionListener);
chkAspect = new gcn::CheckBox("Correct Aspect Ratio");
chkAspect->setId("chkAspect");
chkAspect->setBaseColor(gui_base_color);
chkAspect->setBackgroundColor(gui_textbox_background_color);
chkAspect->setBackgroundColor(gui_background_color);
chkAspect->setForegroundColor(gui_foreground_color);
chkAspect->addActionListener(amigaScreenActionListener);
chkFrameskip = new gcn::CheckBox("Refresh:");
chkFrameskip->setId("chkFrameskip");
chkFrameskip->setBaseColor(gui_base_color);
chkFrameskip->setBackgroundColor(gui_textbox_background_color);
chkFrameskip->setBackgroundColor(gui_background_color);
chkFrameskip->setForegroundColor(gui_foreground_color);
chkFrameskip->addActionListener(amigaScreenActionListener);
sldRefresh = new gcn::Slider(1, 10);
sldRefresh->setSize(100, SLIDER_HEIGHT);
sldRefresh->setBaseColor(gui_base_color);
sldRefresh->setBackgroundColor(gui_textbox_background_color);
sldRefresh->setBackgroundColor(gui_background_color);
sldRefresh->setForegroundColor(gui_foreground_color);
sldRefresh->setMarkerLength(20);
sldRefresh->setStepLength(1);
@ -740,14 +740,14 @@ void InitPanelDisplay(const config_category& category)
chkFpsAdj = new gcn::CheckBox("FPS Adj:");
chkFpsAdj->setId("chkFpsAdj");
chkFpsAdj->setBaseColor(gui_base_color);
chkFpsAdj->setBackgroundColor(gui_textbox_background_color);
chkFpsAdj->setBackgroundColor(gui_background_color);
chkFpsAdj->setForegroundColor(gui_foreground_color);
chkFpsAdj->addActionListener(amigaScreenActionListener);
cboFpsRate = new gcn::DropDown(&fps_options_list);
cboFpsRate->setSize(80, cboFpsRate->getHeight());
cboFpsRate->setBaseColor(gui_base_color);
cboFpsRate->setBackgroundColor(gui_textbox_background_color);
cboFpsRate->setBackgroundColor(gui_background_color);
cboFpsRate->setForegroundColor(gui_foreground_color);
cboFpsRate->setSelectionColor(gui_selection_color);
cboFpsRate->setId("cboFpsRate");
@ -756,7 +756,7 @@ void InitPanelDisplay(const config_category& category)
sldFpsAdj = new gcn::Slider(1, 99);
sldFpsAdj->setSize(100, SLIDER_HEIGHT);
sldFpsAdj->setBaseColor(gui_base_color);
sldFpsAdj->setBackgroundColor(gui_textbox_background_color);
sldFpsAdj->setBackgroundColor(gui_background_color);
sldFpsAdj->setForegroundColor(gui_foreground_color);
sldFpsAdj->setMarkerLength(20);
sldFpsAdj->setStepLength(1);
@ -765,7 +765,7 @@ void InitPanelDisplay(const config_category& category)
txtFpsAdj = new gcn::TextField();
txtFpsAdj->setSize(80, TEXTFIELD_HEIGHT);
txtFpsAdj->setBaseColor(gui_base_color);
txtFpsAdj->setBackgroundColor(gui_textbox_background_color);
txtFpsAdj->setBackgroundColor(gui_background_color);
txtFpsAdj->setForegroundColor(gui_foreground_color);
txtFpsAdj->addKeyListener(amigaScreenKeyListener);
@ -774,7 +774,7 @@ void InitPanelDisplay(const config_category& category)
sldBrightness = new gcn::Slider(-200, 200);
sldBrightness->setSize(100, SLIDER_HEIGHT);
sldBrightness->setBaseColor(gui_base_color);
sldBrightness->setBackgroundColor(gui_textbox_background_color);
sldBrightness->setBackgroundColor(gui_background_color);
sldBrightness->setForegroundColor(gui_foreground_color);
sldBrightness->setMarkerLength(20);
sldBrightness->setStepLength(1);
@ -788,7 +788,7 @@ void InitPanelDisplay(const config_category& category)
cboScreenmode = new gcn::DropDown(&fullscreen_modes_list);
cboScreenmode->setSize(150, cboScreenmode->getHeight());
cboScreenmode->setBaseColor(gui_base_color);
cboScreenmode->setBackgroundColor(gui_textbox_background_color);
cboScreenmode->setBackgroundColor(gui_background_color);
cboScreenmode->setForegroundColor(gui_foreground_color);
cboScreenmode->setSelectionColor(gui_selection_color);
cboScreenmode->setId("cboScreenmode");
@ -799,7 +799,7 @@ void InitPanelDisplay(const config_category& category)
cboResolution = new gcn::DropDown(&resolution_list);
cboResolution->setSize(150, cboResolution->getHeight());
cboResolution->setBaseColor(gui_base_color);
cboResolution->setBackgroundColor(gui_textbox_background_color);
cboResolution->setBackgroundColor(gui_background_color);
cboResolution->setForegroundColor(gui_foreground_color);
cboResolution->setSelectionColor(gui_selection_color);
cboResolution->setId("cboResolution");
@ -810,7 +810,7 @@ void InitPanelDisplay(const config_category& category)
cboResSwitch = new gcn::DropDown(&res_autoswitch_list);
cboResSwitch->setSize(150, cboResSwitch->getHeight());
cboResSwitch->setBaseColor(gui_base_color);
cboResSwitch->setBackgroundColor(gui_textbox_background_color);
cboResSwitch->setBackgroundColor(gui_background_color);
cboResSwitch->setForegroundColor(gui_foreground_color);
cboResSwitch->setSelectionColor(gui_selection_color);
cboResSwitch->setId("cboResSwitch");
@ -882,7 +882,7 @@ void InitPanelDisplay(const config_category& category)
cboScalingMethod = new gcn::DropDown(&scaling_method_list);
cboScalingMethod->setSize(150, cboScalingMethod->getHeight());
cboScalingMethod->setBaseColor(gui_base_color);
cboScalingMethod->setBackgroundColor(gui_textbox_background_color);
cboScalingMethod->setBackgroundColor(gui_background_color);
cboScalingMethod->setForegroundColor(gui_foreground_color);
cboScalingMethod->setSelectionColor(gui_selection_color);
cboScalingMethod->setId("cboScalingMethod");
@ -902,35 +902,35 @@ void InitPanelDisplay(const config_category& category)
optSingle = new gcn::RadioButton("Single", "linemodegroup");
optSingle->setId("optSingle");
optSingle->setBaseColor(gui_base_color);
optSingle->setBackgroundColor(gui_textbox_background_color);
optSingle->setBackgroundColor(gui_background_color);
optSingle->setForegroundColor(gui_foreground_color);
optSingle->addActionListener(lineModeActionListener);
optDouble = new gcn::RadioButton("Double", "linemodegroup");
optDouble->setId("optDouble");
optDouble->setBaseColor(gui_base_color);
optDouble->setBackgroundColor(gui_textbox_background_color);
optDouble->setBackgroundColor(gui_background_color);
optDouble->setForegroundColor(gui_foreground_color);
optDouble->addActionListener(lineModeActionListener);
optScanlines = new gcn::RadioButton("Scanlines", "linemodegroup");
optScanlines->setId("optScanlines");
optScanlines->setBaseColor(gui_base_color);
optScanlines->setBackgroundColor(gui_textbox_background_color);
optScanlines->setBackgroundColor(gui_background_color);
optScanlines->setForegroundColor(gui_foreground_color);
optScanlines->addActionListener(lineModeActionListener);
optDouble2 = new gcn::RadioButton("Double, fields", "linemodegroup");
optDouble2->setId("optDouble2");
optDouble2->setBaseColor(gui_base_color);
optDouble2->setBackgroundColor(gui_textbox_background_color);
optDouble2->setBackgroundColor(gui_background_color);
optDouble2->setForegroundColor(gui_foreground_color);
optDouble2->addActionListener(lineModeActionListener);
optDouble3 = new gcn::RadioButton("Double, fields+", "linemodegroup");
optDouble3->setId("optDouble3");
optDouble3->setBaseColor(gui_base_color);
optDouble3->setBackgroundColor(gui_textbox_background_color);
optDouble3->setBackgroundColor(gui_background_color);
optDouble3->setForegroundColor(gui_foreground_color);
optDouble3->addActionListener(lineModeActionListener);
@ -951,28 +951,28 @@ void InitPanelDisplay(const config_category& category)
optISingle = new gcn::RadioButton("Single", "ilinemodegroup");
optISingle->setId("optISingle");
optISingle->setBaseColor(gui_base_color);
optISingle->setBackgroundColor(gui_textbox_background_color);
optISingle->setBackgroundColor(gui_background_color);
optISingle->setForegroundColor(gui_foreground_color);
optISingle->addActionListener(lineModeActionListener);
optIDouble = new gcn::RadioButton("Double, frames", "ilinemodegroup");
optIDouble->setId("optIDouble");
optIDouble->setBaseColor(gui_base_color);
optIDouble->setBackgroundColor(gui_textbox_background_color);
optIDouble->setBackgroundColor(gui_background_color);
optIDouble->setForegroundColor(gui_foreground_color);
optIDouble->addActionListener(lineModeActionListener);
optIDouble2 = new gcn::RadioButton("Double, fields", "ilinemodegroup");
optIDouble2->setId("optIDouble2");
optIDouble2->setBaseColor(gui_base_color);
optIDouble2->setBackgroundColor(gui_textbox_background_color);
optIDouble2->setBackgroundColor(gui_background_color);
optIDouble2->setForegroundColor(gui_foreground_color);
optIDouble2->addActionListener(lineModeActionListener);
optIDouble3 = new gcn::RadioButton("Double, fields+", "ilinemodegroup");
optIDouble3->setId("optIDouble3");
optIDouble3->setBaseColor(gui_base_color);
optIDouble3->setBackgroundColor(gui_textbox_background_color);
optIDouble3->setBackgroundColor(gui_background_color);
optIDouble3->setForegroundColor(gui_foreground_color);
optIDouble3->addActionListener(lineModeActionListener);

48
src/osdep/gui/PanelExpansions.cpp
View File

@ -884,7 +884,7 @@ void InitPanelExpansions(const config_category& category)
cboScsiRomSelectCat = new gcn::DropDown(&scsirom_select_cat_list);
cboScsiRomSelectCat->setSize(250, cboScsiRomSelectCat->getHeight());
cboScsiRomSelectCat->setBaseColor(gui_base_color);
cboScsiRomSelectCat->setBackgroundColor(gui_textbox_background_color);
cboScsiRomSelectCat->setBackgroundColor(gui_background_color);
cboScsiRomSelectCat->setForegroundColor(gui_foreground_color);
cboScsiRomSelectCat->setSelectionColor(gui_selection_color);
cboScsiRomSelectCat->setId("cboScsiRomSelectCat");
@ -893,7 +893,7 @@ void InitPanelExpansions(const config_category& category)
cboScsiRomSelect = new gcn::DropDown(&scsirom_select_list);
cboScsiRomSelect->setSize(250, cboScsiRomSelect->getHeight());
cboScsiRomSelect->setBaseColor(gui_base_color);
cboScsiRomSelect->setBackgroundColor(gui_textbox_background_color);
cboScsiRomSelect->setBackgroundColor(gui_background_color);
cboScsiRomSelect->setForegroundColor(gui_foreground_color);
cboScsiRomSelect->setSelectionColor(gui_selection_color);
cboScsiRomSelect->setId("cboScsiRomSelect");
@ -902,7 +902,7 @@ void InitPanelExpansions(const config_category& category)
cboScsiRomSubSelect = new gcn::DropDown(&scsirom_subselect_list);
cboScsiRomSubSelect->setSize(250, cboScsiRomSubSelect->getHeight());
cboScsiRomSubSelect->setBaseColor(gui_base_color);
cboScsiRomSubSelect->setBackgroundColor(gui_textbox_background_color);
cboScsiRomSubSelect->setBackgroundColor(gui_background_color);
cboScsiRomSubSelect->setForegroundColor(gui_foreground_color);
cboScsiRomSubSelect->setSelectionColor(gui_selection_color);
cboScsiRomSubSelect->setId("cboScsiRomSubSelect");
@ -911,14 +911,14 @@ void InitPanelExpansions(const config_category& category)
chkScsiRomSelected = new gcn::CheckBox("Enabled");
chkScsiRomSelected->setId("chkScsiRomSelected");
chkScsiRomSelected->setBaseColor(gui_base_color);
chkScsiRomSelected->setBackgroundColor(gui_textbox_background_color);
chkScsiRomSelected->setBackgroundColor(gui_background_color);
chkScsiRomSelected->setForegroundColor(gui_foreground_color);
chkScsiRomSelected->addActionListener(expansions_action_listener);
cboScsiRomFile = new gcn::DropDown(&scsirom_file_list);
cboScsiRomFile->setSize(200, cboScsiRomFile->getHeight());
cboScsiRomFile->setBaseColor(gui_base_color);
cboScsiRomFile->setBackgroundColor(gui_textbox_background_color);
cboScsiRomFile->setBackgroundColor(gui_background_color);
cboScsiRomFile->setForegroundColor(gui_foreground_color);
cboScsiRomFile->setSelectionColor(gui_selection_color);
cboScsiRomFile->setId("cboScsiRomFile");
@ -927,7 +927,7 @@ void InitPanelExpansions(const config_category& category)
cboScsiRomId = new gcn::DropDown(&scsi_romid_list);
cboScsiRomId->setSize(30, cboScsiRomId->getHeight());
cboScsiRomId->setBaseColor(gui_base_color);
cboScsiRomId->setBackgroundColor(gui_textbox_background_color);
cboScsiRomId->setBackgroundColor(gui_background_color);
cboScsiRomId->setForegroundColor(gui_foreground_color);
cboScsiRomId->setSelectionColor(gui_selection_color);
cboScsiRomId->setId("cboScsiRomId");
@ -936,7 +936,7 @@ void InitPanelExpansions(const config_category& category)
cboScsiRomSelectNum = new gcn::DropDown(&scsirom_selectnum_list);
cboScsiRomSelectNum->setSize(30, cboScsiRomSelectNum->getHeight());
cboScsiRomSelectNum->setBaseColor(gui_base_color);
cboScsiRomSelectNum->setBackgroundColor(gui_textbox_background_color);
cboScsiRomSelectNum->setBackgroundColor(gui_background_color);
cboScsiRomSelectNum->setForegroundColor(gui_foreground_color);
cboScsiRomSelectNum->setSelectionColor(gui_selection_color);
cboScsiRomSelectNum->setId("cboScsiRomSelectNum");
@ -944,7 +944,7 @@ void InitPanelExpansions(const config_category& category)
btnScsiRomChooser = new gcn::Button("...");
btnScsiRomChooser->setBaseColor(gui_base_color);
btnScsiRomChooser->setBackgroundColor(gui_textbox_background_color);
btnScsiRomChooser->setBackgroundColor(gui_background_color);
btnScsiRomChooser->setForegroundColor(gui_foreground_color);
btnScsiRomChooser->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
btnScsiRomChooser->setId("btnScsiRomChooser");
@ -953,21 +953,21 @@ void InitPanelExpansions(const config_category& category)
chkScsiRomFileAutoboot = new gcn::CheckBox("Autoboot disabled");
chkScsiRomFileAutoboot->setId("chkScsiRomFileAutoboot");
chkScsiRomFileAutoboot->setBaseColor(gui_base_color);
chkScsiRomFileAutoboot->setBackgroundColor(gui_textbox_background_color);
chkScsiRomFileAutoboot->setBackgroundColor(gui_background_color);
chkScsiRomFileAutoboot->setForegroundColor(gui_foreground_color);
chkScsiRomFileAutoboot->addActionListener(expansions_action_listener);
chkScsiRomFilePcmcia = new gcn::CheckBox("PCMCIA inserted");
chkScsiRomFilePcmcia->setId("chkScsiRomFilePcmcia");
chkScsiRomFilePcmcia->setBaseColor(gui_base_color);
chkScsiRomFilePcmcia->setBackgroundColor(gui_textbox_background_color);
chkScsiRomFilePcmcia->setBackgroundColor(gui_background_color);
chkScsiRomFilePcmcia->setForegroundColor(gui_foreground_color);
chkScsiRomFilePcmcia->addActionListener(expansions_action_listener);
cboExpansionBoardItemSelector = new gcn::DropDown(&expansionboard_itemselector_list);
cboExpansionBoardItemSelector->setSize(250, cboExpansionBoardItemSelector->getHeight());
cboExpansionBoardItemSelector->setBaseColor(gui_base_color);
cboExpansionBoardItemSelector->setBackgroundColor(gui_textbox_background_color);
cboExpansionBoardItemSelector->setBackgroundColor(gui_background_color);
cboExpansionBoardItemSelector->setForegroundColor(gui_foreground_color);
cboExpansionBoardItemSelector->setSelectionColor(gui_selection_color);
cboExpansionBoardItemSelector->setId("cboExpansionBoardItemSelector");
@ -977,7 +977,7 @@ void InitPanelExpansions(const config_category& category)
cboExpansionBoardSelector = new gcn::DropDown(&expansionboard_itemselector_list);
cboExpansionBoardSelector->setSize(250, cboExpansionBoardSelector->getHeight());
cboExpansionBoardSelector->setBaseColor(gui_base_color);
cboExpansionBoardSelector->setBackgroundColor(gui_textbox_background_color);
cboExpansionBoardSelector->setBackgroundColor(gui_background_color);
cboExpansionBoardSelector->setForegroundColor(gui_foreground_color);
cboExpansionBoardSelector->setSelectionColor(gui_selection_color);
cboExpansionBoardSelector->setId("cboExpansionBoardSelector");
@ -986,7 +986,7 @@ void InitPanelExpansions(const config_category& category)
chkExpansionBoardCheckbox = new gcn::CheckBox("");
chkExpansionBoardCheckbox->setId("chkExpansionBoardCheckbox");
chkExpansionBoardCheckbox->setBaseColor(gui_base_color);
chkExpansionBoardCheckbox->setBackgroundColor(gui_textbox_background_color);
chkExpansionBoardCheckbox->setBackgroundColor(gui_background_color);
chkExpansionBoardCheckbox->setForegroundColor(gui_foreground_color);
chkExpansionBoardCheckbox->addActionListener(expansions_action_listener);
@ -994,13 +994,13 @@ void InitPanelExpansions(const config_category& category)
txtExpansionBoardStringBox->setSize(200, txtExpansionBoardStringBox->getHeight());
txtExpansionBoardStringBox->setId("txtExpansionBoardStringBox");
txtExpansionBoardStringBox->setBaseColor(gui_base_color);
txtExpansionBoardStringBox->setBackgroundColor(gui_textbox_background_color);
txtExpansionBoardStringBox->setBackgroundColor(gui_background_color);
txtExpansionBoardStringBox->setForegroundColor(gui_foreground_color);
cboCpuBoardType = new gcn::DropDown(&cpuboards_list);
cboCpuBoardType->setSize(250, cboCpuBoardType->getHeight());
cboCpuBoardType->setBaseColor(gui_base_color);
cboCpuBoardType->setBackgroundColor(gui_textbox_background_color);
cboCpuBoardType->setBackgroundColor(gui_background_color);
cboCpuBoardType->setForegroundColor(gui_foreground_color);
cboCpuBoardType->setSelectionColor(gui_selection_color);
cboCpuBoardType->setId("cboCpuBoardType");
@ -1010,7 +1010,7 @@ void InitPanelExpansions(const config_category& category)
cboCpuBoardSubType = new gcn::DropDown(&cpuboards_subtype_list);
cboCpuBoardSubType->setSize(250, cboCpuBoardSubType->getHeight());
cboCpuBoardSubType->setBaseColor(gui_base_color);
cboCpuBoardSubType->setBackgroundColor(gui_textbox_background_color);
cboCpuBoardSubType->setBackgroundColor(gui_background_color);
cboCpuBoardSubType->setForegroundColor(gui_foreground_color);
cboCpuBoardSubType->setSelectionColor(gui_selection_color);
cboCpuBoardSubType->setId("cboCpuBoardSubType");
@ -1020,7 +1020,7 @@ void InitPanelExpansions(const config_category& category)
cboCpuBoardRomFile = new gcn::DropDown(&cpuboard_romfile_list);
cboCpuBoardRomFile->setSize(250, cboCpuBoardRomFile->getHeight());
cboCpuBoardRomFile->setBaseColor(gui_base_color);
cboCpuBoardRomFile->setBackgroundColor(gui_textbox_background_color);
cboCpuBoardRomFile->setBackgroundColor(gui_background_color);
cboCpuBoardRomFile->setForegroundColor(gui_foreground_color);
cboCpuBoardRomFile->setSelectionColor(gui_selection_color);
cboCpuBoardRomFile->setId("cboCpuBoardRomFile");
@ -1030,7 +1030,7 @@ void InitPanelExpansions(const config_category& category)
cboAcceleratorBoardItemSelector = new gcn::DropDown(&acceleratorboard_itemselector_list);
cboAcceleratorBoardItemSelector->setSize(250, cboAcceleratorBoardItemSelector->getHeight());
cboAcceleratorBoardItemSelector->setBaseColor(gui_base_color);
cboAcceleratorBoardItemSelector->setBackgroundColor(gui_textbox_background_color);
cboAcceleratorBoardItemSelector->setBackgroundColor(gui_background_color);
cboAcceleratorBoardItemSelector->setForegroundColor(gui_foreground_color);
cboAcceleratorBoardItemSelector->setSelectionColor(gui_selection_color);
cboAcceleratorBoardItemSelector->setId("cboAcceleratorBoardItemSelector");
@ -1039,7 +1039,7 @@ void InitPanelExpansions(const config_category& category)
cboAcceleratorBoardSelector = new gcn::DropDown(&acceleratorboard_selector_list);
cboAcceleratorBoardSelector->setSize(250, cboAcceleratorBoardItemSelector->getHeight());
cboAcceleratorBoardSelector->setBaseColor(gui_base_color);
cboAcceleratorBoardSelector->setBackgroundColor(gui_textbox_background_color);
cboAcceleratorBoardSelector->setBackgroundColor(gui_background_color);
cboAcceleratorBoardSelector->setForegroundColor(gui_foreground_color);
cboAcceleratorBoardSelector->setSelectionColor(gui_selection_color);
cboAcceleratorBoardSelector->setId("cboAcceleratorBoardSelector");
@ -1048,35 +1048,35 @@ void InitPanelExpansions(const config_category& category)
chkAcceleratorBoardCheckbox = new gcn::CheckBox("");
chkAcceleratorBoardCheckbox->setId("chkAcceleratorBoardCheckbox");
chkAcceleratorBoardCheckbox->setBaseColor(gui_base_color);
chkAcceleratorBoardCheckbox->setBackgroundColor(gui_textbox_background_color);
chkAcceleratorBoardCheckbox->setBackgroundColor(gui_background_color);
chkAcceleratorBoardCheckbox->setForegroundColor(gui_foreground_color);
chkAcceleratorBoardCheckbox->addActionListener(expansions_action_listener);
chkBSDSocket = new gcn::CheckBox("bsdsocket.library");
chkBSDSocket->setId("chkBSDSocket");
chkBSDSocket->setBaseColor(gui_base_color);
chkBSDSocket->setBackgroundColor(gui_textbox_background_color);
chkBSDSocket->setBackgroundColor(gui_background_color);
chkBSDSocket->setForegroundColor(gui_foreground_color);
chkBSDSocket->addActionListener(expansions_action_listener);
chkScsi = new gcn::CheckBox("uaescsi.device");
chkScsi->setId("chkSCSI");
chkScsi->setBaseColor(gui_base_color);
chkScsi->setBackgroundColor(gui_textbox_background_color);
chkScsi->setBackgroundColor(gui_background_color);
chkScsi->setForegroundColor(gui_foreground_color);
chkScsi->addActionListener(expansions_action_listener);
chkCD32Fmv = new gcn::CheckBox("CD32 Full Motion Video cartridge");
chkCD32Fmv->setId("chkCD32Fmv");
chkCD32Fmv->setBaseColor(gui_base_color);
chkCD32Fmv->setBackgroundColor(gui_textbox_background_color);
chkCD32Fmv->setBackgroundColor(gui_background_color);
chkCD32Fmv->setForegroundColor(gui_foreground_color);
chkCD32Fmv->addActionListener(expansions_action_listener);
chkSana2 = new gcn::CheckBox("uaenet.device");
chkSana2->setId("chkSana2");
chkSana2->setBaseColor(gui_base_color);
chkSana2->setBackgroundColor(gui_textbox_background_color);
chkSana2->setBackgroundColor(gui_background_color);
chkSana2->setForegroundColor(gui_foreground_color);
chkSana2->addActionListener(expansions_action_listener);
chkSana2->setEnabled(true);

22
src/osdep/gui/PanelFloppy.cpp
View File

@ -408,14 +408,14 @@ void InitPanelFloppy(const config_category& category)
chkDFx[i] = new gcn::CheckBox(id_string);
chkDFx[i]->setId(id_string);
chkDFx[i]->setBaseColor(gui_base_color);
chkDFx[i]->setBackgroundColor(gui_textbox_background_color);
chkDFx[i]->setBackgroundColor(gui_background_color);
chkDFx[i]->setForegroundColor(gui_foreground_color);
chkDFx[i]->addActionListener(dfxCheckActionListener);
cboDFxType[i] = new gcn::DropDown(&driveTypeList);
cboDFxType[i]->setSize(150, cboDFxType[i]->getHeight());
cboDFxType[i]->setBaseColor(gui_base_color);
cboDFxType[i]->setBackgroundColor(gui_textbox_background_color);
cboDFxType[i]->setBackgroundColor(gui_background_color);
cboDFxType[i]->setForegroundColor(gui_foreground_color);
cboDFxType[i]->setSelectionColor(gui_selection_color);
id_string = "cboType" + to_string(i);
@ -426,7 +426,7 @@ void InitPanelFloppy(const config_category& category)
id_string = "chkWP" + to_string(i);
chkDFxWriteProtect[i]->setId(id_string);
chkDFxWriteProtect[i]->setBaseColor(gui_base_color);
chkDFxWriteProtect[i]->setBackgroundColor(gui_textbox_background_color);
chkDFxWriteProtect[i]->setBackgroundColor(gui_background_color);
chkDFxWriteProtect[i]->setForegroundColor(gui_foreground_color);
chkDFxWriteProtect[i]->addActionListener(dfxCheckActionListener);
@ -459,7 +459,7 @@ void InitPanelFloppy(const config_category& category)
cboDFxFile[i]->setId(id_string);
cboDFxFile[i]->setSize(textFieldWidth, cboDFxFile[i]->getHeight());
cboDFxFile[i]->setBaseColor(gui_base_color);
cboDFxFile[i]->setBackgroundColor(gui_textbox_background_color);
cboDFxFile[i]->setBackgroundColor(gui_background_color);
cboDFxFile[i]->setForegroundColor(gui_foreground_color);
cboDFxFile[i]->setSelectionColor(gui_selection_color);
cboDFxFile[i]->addActionListener(diskFileActionListener);
@ -469,7 +469,7 @@ void InitPanelFloppy(const config_category& category)
sldDriveSpeed = new gcn::Slider(0, 4);
sldDriveSpeed->setSize(110, SLIDER_HEIGHT);
sldDriveSpeed->setBaseColor(gui_base_color);
sldDriveSpeed->setBackgroundColor(gui_textbox_background_color);
sldDriveSpeed->setBackgroundColor(gui_background_color);
sldDriveSpeed->setForegroundColor(gui_foreground_color);
sldDriveSpeed->setMarkerLength(20);
sldDriveSpeed->setStepLength(1);
@ -496,7 +496,7 @@ void InitPanelFloppy(const config_category& category)
cboDBDriver->setId("cboDBDriver");
cboDBDriver->setSize(350, cboDBDriver->getHeight());
cboDBDriver->setBaseColor(gui_base_color);
cboDBDriver->setBackgroundColor(gui_textbox_background_color);
cboDBDriver->setBackgroundColor(gui_background_color);
cboDBDriver->setForegroundColor(gui_foreground_color);
cboDBDriver->setSelectionColor(gui_selection_color);
cboDBDriver->addActionListener(dfxCheckActionListener);
@ -504,14 +504,14 @@ void InitPanelFloppy(const config_category& category)
chkDBSerialAuto = new gcn::CheckBox("DrawBridge: Auto-Detect serial port");
chkDBSerialAuto->setId("chkDBSerialAuto");
chkDBSerialAuto->setBaseColor(gui_base_color);
chkDBSerialAuto->setBackgroundColor(gui_textbox_background_color);
chkDBSerialAuto->setBackgroundColor(gui_background_color);
chkDBSerialAuto->setForegroundColor(gui_foreground_color);
chkDBSerialAuto->addActionListener(dfxCheckActionListener);
cboDBSerialPort = new gcn::DropDown(&serial_ports_list);
cboDBSerialPort->setSize(200, cboDBSerialPort->getHeight());
cboDBSerialPort->setBaseColor(gui_base_color);
cboDBSerialPort->setBackgroundColor(gui_textbox_background_color);
cboDBSerialPort->setBackgroundColor(gui_background_color);
cboDBSerialPort->setForegroundColor(gui_foreground_color);
cboDBSerialPort->setSelectionColor(gui_selection_color);
cboDBSerialPort->setId("cboDBSerialPort");
@ -520,21 +520,21 @@ void InitPanelFloppy(const config_category& category)
chkDBSmartSpeed = new gcn::CheckBox("DrawBridge: Smart Speed (Dynamically switch on Turbo)");
chkDBSmartSpeed->setId("chkDBSmartSpeed");
chkDBSmartSpeed->setBaseColor(gui_base_color);
chkDBSmartSpeed->setBackgroundColor(gui_textbox_background_color);
chkDBSmartSpeed->setBackgroundColor(gui_background_color);
chkDBSmartSpeed->setForegroundColor(gui_foreground_color);
chkDBSmartSpeed->addActionListener(dfxCheckActionListener);
chkDBAutoCache = new gcn::CheckBox("DrawBridge: Auto-Cache (Cache disk data while drive is idle)");
chkDBAutoCache->setId("chkDBAutoCache");
chkDBAutoCache->setBaseColor(gui_base_color);
chkDBAutoCache->setBackgroundColor(gui_textbox_background_color);
chkDBAutoCache->setBackgroundColor(gui_background_color);
chkDBAutoCache->setForegroundColor(gui_foreground_color);
chkDBAutoCache->addActionListener(dfxCheckActionListener);
chkDBCableDriveB = new gcn::CheckBox("DrawBridge: Connected as Drive B");
chkDBCableDriveB->setId("chkDBCableDriveB");
chkDBCableDriveB->setBaseColor(gui_base_color);
chkDBCableDriveB->setBackgroundColor(gui_textbox_background_color);
chkDBCableDriveB->setBackgroundColor(gui_background_color);
chkDBCableDriveB->setForegroundColor(gui_foreground_color);
chkDBCableDriveB->addActionListener(dfxCheckActionListener);

10
src/osdep/gui/PanelHD.cpp
View File

@ -382,7 +382,7 @@ void InitPanelHD(const config_category& category)
listEntry[row] = new gcn::Container();
listEntry[row]->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, SMALL_BUTTON_HEIGHT + 4);
listEntry[row]->setBaseColor(gui_base_color);
listEntry[row]->setBackgroundColor(gui_textbox_background_color);
listEntry[row]->setBackgroundColor(gui_background_color);
listEntry[row]->setForegroundColor(gui_foreground_color);
listEntry[row]->setFrameSize(0);
@ -408,7 +408,7 @@ void InitPanelHD(const config_category& category)
listCells[row][col]->setSize(COLUMN_SIZE[col], SMALL_BUTTON_HEIGHT);
listCells[row][col]->setEnabled(false);
listCells[row][col]->setBaseColor(gui_base_color);
listCells[row][col]->setBackgroundColor(gui_textbox_background_color);
listCells[row][col]->setBackgroundColor(gui_background_color);
listCells[row][col]->setForegroundColor(gui_foreground_color);
}
}
@ -464,14 +464,14 @@ void InitPanelHD(const config_category& category)
chkCD = new gcn::CheckBox("CD drive/image");
chkCD->setId("chkCD");
chkCD->setBaseColor(gui_base_color);
chkCD->setBackgroundColor(gui_textbox_background_color);
chkCD->setBackgroundColor(gui_background_color);
chkCD->setForegroundColor(gui_foreground_color);
chkCD->addActionListener(cdCheckActionListener);
chkCDTurbo = new gcn::CheckBox("CDTV/CDTV-CR/CD32 turbo CD read speed");
chkCDTurbo->setId("chkCDTurbo");
chkCDTurbo->setBaseColor(gui_base_color);
chkCDTurbo->setBackgroundColor(gui_textbox_background_color);
chkCDTurbo->setBackgroundColor(gui_background_color);
chkCDTurbo->setForegroundColor(gui_foreground_color);
chkCDTurbo->addActionListener(cdCheckActionListener);
@ -492,7 +492,7 @@ void InitPanelHD(const config_category& category)
cboCDFile = new gcn::DropDown(&cdfileList);
cboCDFile->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboCDFile->getHeight());
cboCDFile->setBaseColor(gui_base_color);
cboCDFile->setBackgroundColor(gui_textbox_background_color);
cboCDFile->setBackgroundColor(gui_background_color);
cboCDFile->setForegroundColor(gui_foreground_color);
cboCDFile->setSelectionColor(gui_selection_color);
cboCDFile->setId("cboCD");

2
src/osdep/gui/PanelHWInfo.cpp
View File

@ -157,7 +157,7 @@ void InitPanelHWInfo(const config_category& category)
listCells[row][col]->setSize(COLUMN_SIZE[col] - 8, TEXTFIELD_HEIGHT);
listCells[row][col]->setEnabled(false);
listCells[row][col]->setBaseColor(gui_base_color);
listCells[row][col]->setBackgroundColor(gui_textbox_background_color);
listCells[row][col]->setBackgroundColor(gui_background_color);
listCells[row][col]->setForegroundColor(gui_foreground_color);
}
}

24
src/osdep/gui/PanelIOPorts.cpp
View File

@ -176,7 +176,7 @@ void InitPanelIO(const config_category& category)
cboSampler = new gcn::DropDown(&sampler_list);
cboSampler->setSize(350, cboSampler->getHeight());
cboSampler->setBaseColor(gui_base_color);
cboSampler->setBackgroundColor(gui_textbox_background_color);
cboSampler->setBackgroundColor(gui_background_color);
cboSampler->setForegroundColor(gui_foreground_color);
cboSampler->setSelectionColor(gui_selection_color);
cboSampler->setId("cboSampler");
@ -185,7 +185,7 @@ void InitPanelIO(const config_category& category)
chkSamplerStereo = new gcn::CheckBox("Stereo sampler");
chkSamplerStereo->setId("chkSamplerStereo");
chkSamplerStereo->setBaseColor(gui_base_color);
chkSamplerStereo->setBackgroundColor(gui_textbox_background_color);
chkSamplerStereo->setBackgroundColor(gui_background_color);
chkSamplerStereo->setForegroundColor(gui_foreground_color);
chkSamplerStereo->addActionListener(ioActionListener);
@ -205,7 +205,7 @@ void InitPanelIO(const config_category& category)
cboSerialPort = new gcn::DropDown(&serial_ports_list);
cboSerialPort->setSize(350, cboSerialPort->getHeight());
cboSerialPort->setBaseColor(gui_base_color);
cboSerialPort->setBackgroundColor(gui_textbox_background_color);
cboSerialPort->setBackgroundColor(gui_background_color);
cboSerialPort->setForegroundColor(gui_foreground_color);
cboSerialPort->setSelectionColor(gui_selection_color);
cboSerialPort->setId("cboSerialPort");
@ -214,35 +214,35 @@ void InitPanelIO(const config_category& category)
chkSerialDirect = new gcn::CheckBox("Direct");
chkSerialDirect->setId("chkSerialDirect");
chkSerialDirect->setBaseColor(gui_base_color);
chkSerialDirect->setBackgroundColor(gui_textbox_background_color);
chkSerialDirect->setBackgroundColor(gui_background_color);
chkSerialDirect->setForegroundColor(gui_foreground_color);
chkSerialDirect->addActionListener(ioActionListener);
chkRTSCTS = new gcn::CheckBox("Host RTS/CTS");
chkRTSCTS->setId("chkRTSCTS");
chkRTSCTS->setBaseColor(gui_base_color);
chkRTSCTS->setBackgroundColor(gui_textbox_background_color);
chkRTSCTS->setBackgroundColor(gui_background_color);
chkRTSCTS->setForegroundColor(gui_foreground_color);
chkRTSCTS->addActionListener(ioActionListener);
chkUaeSerial = new gcn::CheckBox("uaeserial.device");
chkUaeSerial->setId("chkUaeSerial");
chkUaeSerial->setBaseColor(gui_base_color);
chkUaeSerial->setBackgroundColor(gui_textbox_background_color);
chkUaeSerial->setBackgroundColor(gui_background_color);
chkUaeSerial->setForegroundColor(gui_foreground_color);
chkUaeSerial->addActionListener(ioActionListener);
chkSerialStatus = new gcn::CheckBox("Serial status (RTS/CTS/DTR/DTE/CD)");
chkSerialStatus->setId("chkSerialStatus");
chkSerialStatus->setBaseColor(gui_base_color);
chkSerialStatus->setBackgroundColor(gui_textbox_background_color);
chkSerialStatus->setBackgroundColor(gui_background_color);
chkSerialStatus->setForegroundColor(gui_foreground_color);
chkSerialStatus->addActionListener(ioActionListener);
chkSerialStatusRi = new gcn::CheckBox("Serial status: Ring Indicator");
chkSerialStatusRi->setId("chkSerialStatusRi");
chkSerialStatusRi->setBaseColor(gui_base_color);
chkSerialStatusRi->setBackgroundColor(gui_textbox_background_color);
chkSerialStatusRi->setBackgroundColor(gui_background_color);
chkSerialStatusRi->setForegroundColor(gui_foreground_color);
chkSerialStatusRi->addActionListener(ioActionListener);
@ -268,7 +268,7 @@ void InitPanelIO(const config_category& category)
cboMidiOut = new gcn::DropDown(&midi_out_ports_list);
cboMidiOut->setSize(200, cboMidiOut->getHeight());
cboMidiOut->setBaseColor(gui_base_color);
cboMidiOut->setBackgroundColor(gui_textbox_background_color);
cboMidiOut->setBackgroundColor(gui_background_color);
cboMidiOut->setForegroundColor(gui_foreground_color);
cboMidiOut->setSelectionColor(gui_selection_color);
cboMidiOut->setId("cboMidiOut");
@ -279,7 +279,7 @@ void InitPanelIO(const config_category& category)
cboMidiIn = new gcn::DropDown(&midi_in_ports_list);
cboMidiIn->setSize(200, cboMidiIn->getHeight());
cboMidiIn->setBaseColor(gui_base_color);
cboMidiIn->setBackgroundColor(gui_textbox_background_color);
cboMidiIn->setBackgroundColor(gui_background_color);
cboMidiIn->setForegroundColor(gui_foreground_color);
cboMidiIn->setSelectionColor(gui_selection_color);
cboMidiIn->setId("cboMidiIn");
@ -288,7 +288,7 @@ void InitPanelIO(const config_category& category)
chkMidiRoute = new gcn::CheckBox("Route MIDI In to MIDI Out");
chkMidiRoute->setId("chkMidiRoute");
chkMidiRoute->setBaseColor(gui_base_color);
chkMidiRoute->setBackgroundColor(gui_textbox_background_color);
chkMidiRoute->setBackgroundColor(gui_background_color);
chkMidiRoute->setForegroundColor(gui_foreground_color);
chkMidiRoute->addActionListener(ioActionListener);
@ -310,7 +310,7 @@ void InitPanelIO(const config_category& category)
cboProtectionDongle = new gcn::DropDown(&dongle_list);
cboProtectionDongle->setSize(350, cboProtectionDongle->getHeight());
cboProtectionDongle->setBaseColor(gui_base_color);
cboProtectionDongle->setBackgroundColor(gui_textbox_background_color);
cboProtectionDongle->setBackgroundColor(gui_background_color);
cboProtectionDongle->setForegroundColor(gui_foreground_color);
cboProtectionDongle->setSelectionColor(gui_selection_color);
cboProtectionDongle->setId("cboProtectionDongle");

28
src/osdep/gui/PanelInput.cpp
View File

@ -352,7 +352,7 @@ void InitPanelInput(const config_category& category)
joys[i] = new gcn::DropDown(&ctrlPortList);
joys[i]->setSize(textFieldWidth, joys[i]->getHeight());
joys[i]->setBaseColor(gui_base_color);
joys[i]->setBackgroundColor(gui_textbox_background_color);
joys[i]->setBackgroundColor(gui_background_color);
joys[i]->setForegroundColor(gui_foreground_color);
joys[i]->setSelectionColor(gui_selection_color);
joys[i]->addActionListener(inputPortsActionListener);
@ -360,7 +360,7 @@ void InitPanelInput(const config_category& category)
joysaf[i] = new gcn::DropDown(&autoFireList);
joysaf[i]->setSize(200, joysaf[i]->getHeight());
joysaf[i]->setBaseColor(gui_base_color);
joysaf[i]->setBackgroundColor(gui_textbox_background_color);
joysaf[i]->setBackgroundColor(gui_background_color);
joysaf[i]->setForegroundColor(gui_foreground_color);
joysaf[i]->setSelectionColor(gui_selection_color);
joysaf[i]->addActionListener(inputPortsActionListener);
@ -370,7 +370,7 @@ void InitPanelInput(const config_category& category)
joysm[i] = new gcn::DropDown(&ctrlPortModeList);
joysm[i]->setSize(150, joysm[i]->getHeight());
joysm[i]->setBaseColor(gui_base_color);
joysm[i]->setBackgroundColor(gui_textbox_background_color);
joysm[i]->setBackgroundColor(gui_background_color);
joysm[i]->setForegroundColor(gui_foreground_color);
joysm[i]->setSelectionColor(gui_selection_color);
joysm[i]->addActionListener(inputPortsActionListener);
@ -378,7 +378,7 @@ void InitPanelInput(const config_category& category)
joysmm[i] = new gcn::DropDown(&ctrlPortMouseModeList);
joysmm[i]->setSize(95, joysmm[i]->getHeight());
joysmm[i]->setBaseColor(gui_base_color);
joysmm[i]->setBackgroundColor(gui_textbox_background_color);
joysmm[i]->setBackgroundColor(gui_background_color);
joysmm[i]->setForegroundColor(gui_foreground_color);
joysmm[i]->setSelectionColor(gui_selection_color);
joysmm[i]->addActionListener(inputPortsActionListener);
@ -445,7 +445,7 @@ void InitPanelInput(const config_category& category)
cboAutofireRate = new gcn::DropDown(&autoFireRateList);
cboAutofireRate->setSize(95, cboAutofireRate->getHeight());
cboAutofireRate->setBaseColor(gui_base_color);
cboAutofireRate->setBackgroundColor(gui_textbox_background_color);
cboAutofireRate->setBackgroundColor(gui_background_color);
cboAutofireRate->setForegroundColor(gui_foreground_color);
cboAutofireRate->setSelectionColor(gui_selection_color);
cboAutofireRate->setId("cboAutofireRate");
@ -457,7 +457,7 @@ void InitPanelInput(const config_category& category)
sldDigitalJoyMouseSpeed = new gcn::Slider(0, 4);
sldDigitalJoyMouseSpeed->setSize(100, SLIDER_HEIGHT);
sldDigitalJoyMouseSpeed->setBaseColor(gui_base_color);
sldDigitalJoyMouseSpeed->setBackgroundColor(gui_textbox_background_color);
sldDigitalJoyMouseSpeed->setBackgroundColor(gui_background_color);
sldDigitalJoyMouseSpeed->setForegroundColor(gui_foreground_color);
sldDigitalJoyMouseSpeed->setMarkerLength(20);
sldDigitalJoyMouseSpeed->setStepLength(1);
@ -470,7 +470,7 @@ void InitPanelInput(const config_category& category)
sldAnalogJoyMouseSpeed = new gcn::Slider(0, 13);
sldAnalogJoyMouseSpeed->setSize(100, SLIDER_HEIGHT);
sldAnalogJoyMouseSpeed->setBaseColor(gui_base_color);
sldAnalogJoyMouseSpeed->setBackgroundColor(gui_textbox_background_color);
sldAnalogJoyMouseSpeed->setBackgroundColor(gui_background_color);
sldAnalogJoyMouseSpeed->setForegroundColor(gui_foreground_color);
sldAnalogJoyMouseSpeed->setMarkerLength(20);
sldAnalogJoyMouseSpeed->setStepLength(1);
@ -483,7 +483,7 @@ void InitPanelInput(const config_category& category)
sldMouseSpeed = new gcn::Slider(0, 13);
sldMouseSpeed->setSize(100, SLIDER_HEIGHT);
sldMouseSpeed->setBaseColor(gui_base_color);
sldMouseSpeed->setBackgroundColor(gui_textbox_background_color);
sldMouseSpeed->setBackgroundColor(gui_background_color);
sldMouseSpeed->setForegroundColor(gui_foreground_color);
sldMouseSpeed->setMarkerLength(20);
sldMouseSpeed->setStepLength(1);
@ -493,40 +493,40 @@ void InitPanelInput(const config_category& category)
chkMouseHack = new gcn::CheckBox("Virtual mouse driver");
chkMouseHack->setId("chkMouseHack");
chkMouseHack->setBaseColor(gui_base_color);
chkMouseHack->setBackgroundColor(gui_textbox_background_color);
chkMouseHack->setBackgroundColor(gui_background_color);
chkMouseHack->setForegroundColor(gui_foreground_color);
chkMouseHack->addActionListener(inputActionListener);
chkMagicMouseUntrap = new gcn::CheckBox("Magic Mouse untrap");
chkMagicMouseUntrap->setId("chkMagicMouseUntrap");
chkMagicMouseUntrap->setBaseColor(gui_base_color);
chkMagicMouseUntrap->setBackgroundColor(gui_textbox_background_color);
chkMagicMouseUntrap->setBackgroundColor(gui_background_color);
chkMagicMouseUntrap->setForegroundColor(gui_foreground_color);
chkMagicMouseUntrap->addActionListener(inputActionListener);
optBoth = new gcn::RadioButton("Both", "radioCursorGroup");
optBoth->setId("optBoth");
optBoth->setBaseColor(gui_base_color);
optBoth->setBackgroundColor(gui_textbox_background_color);
optBoth->setBackgroundColor(gui_background_color);
optBoth->setForegroundColor(gui_foreground_color);
optBoth->addActionListener(inputActionListener);
optNative = new gcn::RadioButton("Native only", "radioCursorGroup");
optNative->setId("optNative");
optNative->setBaseColor(gui_base_color);
optNative->setBackgroundColor(gui_textbox_background_color);
optNative->setBackgroundColor(gui_background_color);
optNative->setForegroundColor(gui_foreground_color);
optNative->addActionListener(inputActionListener);
optHost = new gcn::RadioButton("Host only", "radioCursorGroup");
optHost->setId("optHost");
optHost->setBaseColor(gui_base_color);
optHost->setBackgroundColor(gui_textbox_background_color);
optHost->setBackgroundColor(gui_background_color);
optHost->setForegroundColor(gui_foreground_color);
optHost->addActionListener(inputActionListener);
chkInputAutoswitch = new gcn::CheckBox("Mouse/Joystick autoswitching");
chkInputAutoswitch->setId("chkInputAutoswitch");
chkInputAutoswitch->setBaseColor(gui_base_color);
chkInputAutoswitch->setBackgroundColor(gui_textbox_background_color);
chkInputAutoswitch->setBackgroundColor(gui_background_color);
chkInputAutoswitch->setForegroundColor(gui_foreground_color);
chkInputAutoswitch->addActionListener(inputActionListener);

64
src/osdep/gui/PanelMisc.cpp
View File

@ -300,168 +300,168 @@ void InitPanelMisc(const config_category& category)
chkStatusLine = new gcn::CheckBox("Status Line native");
chkStatusLine->setId("chkStatusLineNative");
chkStatusLine->setBaseColor(gui_base_color);
chkStatusLine->setBackgroundColor(gui_textbox_background_color);
chkStatusLine->setBackgroundColor(gui_background_color);
chkStatusLine->setForegroundColor(gui_foreground_color);
chkStatusLine->addActionListener(miscActionListener);
chkStatusLineRtg = new gcn::CheckBox("Status Line RTG");
chkStatusLineRtg->setId("chkStatusLineRtg");
chkStatusLineRtg->setBaseColor(gui_base_color);
chkStatusLineRtg->setBackgroundColor(gui_textbox_background_color);
chkStatusLineRtg->setBackgroundColor(gui_background_color);
chkStatusLineRtg->setForegroundColor(gui_foreground_color);
chkStatusLineRtg->addActionListener(miscActionListener);
chkShowGUI = new gcn::CheckBox("Show GUI on startup");
chkShowGUI->setId("chkShowGUI");
chkShowGUI->setBaseColor(gui_base_color);
chkShowGUI->setBackgroundColor(gui_textbox_background_color);
chkShowGUI->setBackgroundColor(gui_background_color);
chkShowGUI->setForegroundColor(gui_foreground_color);
chkShowGUI->addActionListener(miscActionListener);
chkMouseUntrap = new gcn::CheckBox("Untrap = middle button");
chkMouseUntrap->setId("chkMouseUntrap");
chkMouseUntrap->setBaseColor(gui_base_color);
chkMouseUntrap->setBackgroundColor(gui_textbox_background_color);
chkMouseUntrap->setBackgroundColor(gui_background_color);
chkMouseUntrap->setForegroundColor(gui_foreground_color);
chkMouseUntrap->addActionListener(miscActionListener);
chkAltTabRelease = new gcn::CheckBox("Alt-Tab releases control");
chkAltTabRelease->setId("chkAltTabRelease");
chkAltTabRelease->setBaseColor(gui_base_color);
chkAltTabRelease->setBackgroundColor(gui_textbox_background_color);
chkAltTabRelease->setBackgroundColor(gui_background_color);
chkAltTabRelease->setForegroundColor(gui_foreground_color);
chkAltTabRelease->addActionListener(miscActionListener);
chkRetroArchQuit = new gcn::CheckBox("Use RetroArch Quit Button");
chkRetroArchQuit->setId("chkRetroArchQuit");
chkRetroArchQuit->setBaseColor(gui_base_color);
chkRetroArchQuit->setBackgroundColor(gui_textbox_background_color);
chkRetroArchQuit->setBackgroundColor(gui_background_color);
chkRetroArchQuit->setForegroundColor(gui_foreground_color);
chkRetroArchQuit->addActionListener(miscActionListener);
chkRetroArchMenu = new gcn::CheckBox("Use RetroArch Menu Button");
chkRetroArchMenu->setId("chkRetroArchMenu");
chkRetroArchMenu->setBaseColor(gui_base_color);
chkRetroArchMenu->setBackgroundColor(gui_textbox_background_color);
chkRetroArchMenu->setBackgroundColor(gui_background_color);
chkRetroArchMenu->setForegroundColor(gui_foreground_color);
chkRetroArchMenu->addActionListener(miscActionListener);
chkRetroArchReset = new gcn::CheckBox("Use RetroArch Reset Button");
chkRetroArchReset->setId("chkRetroArchReset");
chkRetroArchReset->setBaseColor(gui_base_color);
chkRetroArchReset->setBackgroundColor(gui_textbox_background_color);
chkRetroArchReset->setBackgroundColor(gui_background_color);
chkRetroArchReset->setForegroundColor(gui_foreground_color);
chkRetroArchReset->addActionListener(miscActionListener);
chkMasterWP = new gcn::CheckBox("Master floppy write protection");
chkMasterWP->setId("chkMasterWP");
chkMasterWP->setBaseColor(gui_base_color);
chkMasterWP->setBackgroundColor(gui_textbox_background_color);
chkMasterWP->setBackgroundColor(gui_background_color);
chkMasterWP->setForegroundColor(gui_foreground_color);
chkMasterWP->addActionListener(miscActionListener);
chkHDReadOnly = new gcn::CheckBox("Master harddrive write protection");
chkHDReadOnly->setId("chkHDReadOnly");
chkHDReadOnly->setBaseColor(gui_base_color);
chkHDReadOnly->setBackgroundColor(gui_textbox_background_color);
chkHDReadOnly->setBackgroundColor(gui_background_color);
chkHDReadOnly->setForegroundColor(gui_foreground_color);
chkHDReadOnly->addActionListener(miscActionListener);
chkClipboardSharing = new gcn::CheckBox("Clipboard sharing");
chkClipboardSharing->setId("chkClipboardSharing");
chkClipboardSharing->setBaseColor(gui_base_color);
chkClipboardSharing->setBackgroundColor(gui_textbox_background_color);
chkClipboardSharing->setBackgroundColor(gui_background_color);
chkClipboardSharing->setForegroundColor(gui_foreground_color);
chkClipboardSharing->addActionListener(miscActionListener);
chkRCtrlIsRAmiga = new gcn::CheckBox("RCtrl = RAmiga");
chkRCtrlIsRAmiga->setId("chkRCtrlIsRAmiga");
chkRCtrlIsRAmiga->setBaseColor(gui_base_color);
chkRCtrlIsRAmiga->setBackgroundColor(gui_textbox_background_color);
chkRCtrlIsRAmiga->setBackgroundColor(gui_background_color);
chkRCtrlIsRAmiga->setForegroundColor(gui_foreground_color);
chkRCtrlIsRAmiga->addActionListener(miscActionListener);
chkMainAlwaysOnTop = new gcn::CheckBox("Always on top");
chkMainAlwaysOnTop->setId("chkMainAlwaysOnTop");
chkMainAlwaysOnTop->setBaseColor(gui_base_color);
chkMainAlwaysOnTop->setBackgroundColor(gui_textbox_background_color);
chkMainAlwaysOnTop->setBackgroundColor(gui_background_color);
chkMainAlwaysOnTop->setForegroundColor(gui_foreground_color);
chkMainAlwaysOnTop->addActionListener(miscActionListener);
chkGuiAlwaysOnTop = new gcn::CheckBox("GUI Always on top");
chkGuiAlwaysOnTop->setId("chkGuiAlwaysOnTop");
chkGuiAlwaysOnTop->setBaseColor(gui_base_color);
chkGuiAlwaysOnTop->setBackgroundColor(gui_textbox_background_color);
chkGuiAlwaysOnTop->setBackgroundColor(gui_background_color);
chkGuiAlwaysOnTop->setForegroundColor(gui_foreground_color);
chkGuiAlwaysOnTop->addActionListener(miscActionListener);
chkSyncClock = new gcn::CheckBox("Synchronize clock");
chkSyncClock->setId("chkSyncClock");
chkSyncClock->setBaseColor(gui_base_color);
chkSyncClock->setBackgroundColor(gui_textbox_background_color);
chkSyncClock->setBackgroundColor(gui_background_color);
chkSyncClock->setForegroundColor(gui_foreground_color);
chkSyncClock->addActionListener(miscActionListener);
chkResetDelay = new gcn::CheckBox("One second reboot pause");
chkResetDelay->setId("chkResetDelay");
chkResetDelay->setBaseColor(gui_base_color);
chkResetDelay->setBackgroundColor(gui_textbox_background_color);
chkResetDelay->setBackgroundColor(gui_background_color);
chkResetDelay->setForegroundColor(gui_foreground_color);
chkResetDelay->addActionListener(miscActionListener);
chkFasterRTG = new gcn::CheckBox("Faster RTG");
chkFasterRTG->setId("chkFasterRTG");
chkFasterRTG->setBaseColor(gui_base_color);
chkFasterRTG->setBackgroundColor(gui_textbox_background_color);
chkFasterRTG->setBackgroundColor(gui_background_color);
chkFasterRTG->setForegroundColor(gui_foreground_color);
chkFasterRTG->addActionListener(miscActionListener);
chkAllowNativeCode = new gcn::CheckBox("Allow native code");
chkAllowNativeCode->setId("chkAllowNativeCode");
chkAllowNativeCode->setBaseColor(gui_base_color);
chkAllowNativeCode->setBackgroundColor(gui_textbox_background_color);
chkAllowNativeCode->setBackgroundColor(gui_background_color);
chkAllowNativeCode->setForegroundColor(gui_foreground_color);
chkAllowNativeCode->addActionListener(miscActionListener);
chkIllegalMem = new gcn::CheckBox("Log illegal memory accesses");
chkIllegalMem->setId("chkIllegalMem");
chkIllegalMem->setBaseColor(gui_base_color);
chkIllegalMem->setBackgroundColor(gui_textbox_background_color);
chkIllegalMem->setBackgroundColor(gui_background_color);
chkIllegalMem->setForegroundColor(gui_foreground_color);
chkIllegalMem->addActionListener(miscActionListener);
chkMinimizeInactive = new gcn::CheckBox("Minimize when focus is lost");
chkMinimizeInactive->setId("chkMinimizeInactive");
chkMinimizeInactive->setBaseColor(gui_base_color);
chkMinimizeInactive->setBackgroundColor(gui_textbox_background_color);
chkMinimizeInactive->setBackgroundColor(gui_background_color);
chkMinimizeInactive->setForegroundColor(gui_foreground_color);
chkMinimizeInactive->addActionListener(miscActionListener);
chkCaptureAlways = new gcn::CheckBox("Capture mouse when window is activated");
chkCaptureAlways->setId("chkCaptureAlways");
chkCaptureAlways->setBaseColor(gui_base_color);
chkCaptureAlways->setBackgroundColor(gui_textbox_background_color);
chkCaptureAlways->setBackgroundColor(gui_background_color);
chkCaptureAlways->setForegroundColor(gui_foreground_color);
chkCaptureAlways->addActionListener(miscActionListener);
chkHideAutoconfig = new gcn::CheckBox("Hide all UAE autoconfig boards");
chkHideAutoconfig->setId("chkHideAutoconfig");
chkHideAutoconfig->setBaseColor(gui_base_color);
chkHideAutoconfig->setBackgroundColor(gui_textbox_background_color);
chkHideAutoconfig->setBackgroundColor(gui_background_color);
chkHideAutoconfig->setForegroundColor(gui_foreground_color);
chkHideAutoconfig->addActionListener(miscActionListener);
chkScsiDisable = new gcn::CheckBox("A600/A1200/A4000 IDE scsi.device disable");
chkScsiDisable->setId("chkScsiDisable");
chkScsiDisable->setBaseColor(gui_base_color);
chkScsiDisable->setBackgroundColor(gui_textbox_background_color);
chkScsiDisable->setBackgroundColor(gui_background_color);
chkScsiDisable->setForegroundColor(gui_foreground_color);
chkScsiDisable->addActionListener(miscActionListener);
chkWarpModeReset = new gcn::CheckBox("Warp mode reset");
chkWarpModeReset->setId("chkWarpModeReset");
chkWarpModeReset->setBaseColor(gui_base_color);
chkWarpModeReset->setBackgroundColor(gui_textbox_background_color);
chkWarpModeReset->setBackgroundColor(gui_background_color);
chkWarpModeReset->setForegroundColor(gui_foreground_color);
chkWarpModeReset->addActionListener(miscActionListener);
@ -469,7 +469,7 @@ void InitPanelMisc(const config_category& category)
lblNumLock->setAlignment(gcn::Graphics::Right);
cboKBDLed_num = new gcn::DropDown(&KBDLedList);
cboKBDLed_num->setBaseColor(gui_base_color);
cboKBDLed_num->setBackgroundColor(gui_textbox_background_color);
cboKBDLed_num->setBackgroundColor(gui_background_color);
cboKBDLed_num->setForegroundColor(gui_foreground_color);
cboKBDLed_num->setSelectionColor(gui_selection_color);
cboKBDLed_num->setId("cboNumlock");
@ -479,7 +479,7 @@ void InitPanelMisc(const config_category& category)
lblScrLock->setAlignment(gcn::Graphics::Right);
cboKBDLed_scr = new gcn::DropDown(&KBDLedList);
cboKBDLed_scr->setBaseColor(gui_base_color);
cboKBDLed_scr->setBackgroundColor(gui_textbox_background_color);
cboKBDLed_scr->setBackgroundColor(gui_background_color);
cboKBDLed_scr->setForegroundColor(gui_foreground_color);
cboKBDLed_scr->setSelectionColor(gui_selection_color);
cboKBDLed_scr->setId("cboScrolllock");
@ -489,7 +489,7 @@ void InitPanelMisc(const config_category& category)
lblCapLock->setAlignment(gcn::Graphics::Left);
cboKBDLed_cap = new gcn::DropDown(&KBDLedList);
cboKBDLed_cap->setBaseColor(gui_base_color);
cboKBDLed_cap->setBackgroundColor(gui_textbox_background_color);
cboKBDLed_cap->setBackgroundColor(gui_background_color);
cboKBDLed_cap->setForegroundColor(gui_foreground_color);
cboKBDLed_cap->setSelectionColor(gui_selection_color);
cboKBDLed_cap->setId("cboCapsLock");
@ -501,7 +501,7 @@ void InitPanelMisc(const config_category& category)
txtOpenGUI->setEnabled(false);
txtOpenGUI->setSize(120, TEXTFIELD_HEIGHT);
txtOpenGUI->setBaseColor(gui_base_color);
txtOpenGUI->setBackgroundColor(gui_textbox_background_color);
txtOpenGUI->setBackgroundColor(gui_background_color);
txtOpenGUI->setForegroundColor(gui_foreground_color);
cmdKeyOpenGUI = new gcn::Button("...");
cmdKeyOpenGUI->setId("cmdKeyOpenGUI");
@ -522,7 +522,7 @@ void InitPanelMisc(const config_category& category)
txtKeyForQuit->setEnabled(false);
txtKeyForQuit->setSize(120, TEXTFIELD_HEIGHT);
txtKeyForQuit->setBaseColor(gui_base_color);
txtKeyForQuit->setBackgroundColor(gui_textbox_background_color);
txtKeyForQuit->setBackgroundColor(gui_background_color);
txtKeyForQuit->setForegroundColor(gui_foreground_color);
cmdKeyForQuit = new gcn::Button("...");
cmdKeyForQuit->setId("cmdKeyForQuit");
@ -543,7 +543,7 @@ void InitPanelMisc(const config_category& category)
txtKeyActionReplay->setEnabled(false);
txtKeyActionReplay->setSize(120, TEXTFIELD_HEIGHT);
txtKeyActionReplay->setBaseColor(gui_base_color);
txtKeyActionReplay->setBackgroundColor(gui_textbox_background_color);
txtKeyActionReplay->setBackgroundColor(gui_background_color);
txtKeyActionReplay->setForegroundColor(gui_foreground_color);
cmdKeyActionReplay = new gcn::Button("...");
cmdKeyActionReplay->setId("cmdKeyActionReplay");
@ -564,7 +564,7 @@ void InitPanelMisc(const config_category& category)
txtKeyFullScreen->setEnabled(false);
txtKeyFullScreen->setSize(120, TEXTFIELD_HEIGHT);
txtKeyFullScreen->setBaseColor(gui_base_color);
txtKeyFullScreen->setBackgroundColor(gui_textbox_background_color);
txtKeyFullScreen->setBackgroundColor(gui_background_color);
txtKeyFullScreen->setForegroundColor(gui_foreground_color);
cmdKeyFullScreen = new gcn::Button("...");
cmdKeyFullScreen->setId("cmdKeyFullScreen");
@ -585,7 +585,7 @@ void InitPanelMisc(const config_category& category)
txtKeyMinimize->setEnabled(false);
txtKeyMinimize->setSize(120, TEXTFIELD_HEIGHT);
txtKeyMinimize->setBaseColor(gui_base_color);
txtKeyMinimize->setBackgroundColor(gui_textbox_background_color);
txtKeyMinimize->setBackgroundColor(gui_background_color);
txtKeyMinimize->setForegroundColor(gui_foreground_color);
cmdKeyMinimize = new gcn::Button("...");
cmdKeyMinimize->setId("cmdKeyMinimize");

36
src/osdep/gui/PanelPaths.cpp
View File

@ -393,7 +393,7 @@ void InitPanelPaths(const config_category& category)
txtSystemROMs = new gcn::TextField();
txtSystemROMs->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtSystemROMs->setBaseColor(gui_base_color);
txtSystemROMs->setBackgroundColor(gui_textbox_background_color);
txtSystemROMs->setBackgroundColor(gui_background_color);
txtSystemROMs->setForegroundColor(gui_foreground_color);
cmdSystemROMs = new gcn::Button("...");
@ -407,7 +407,7 @@ void InitPanelPaths(const config_category& category)
txtConfigPath = new gcn::TextField();
txtConfigPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtConfigPath->setBaseColor(gui_base_color);
txtConfigPath->setBackgroundColor(gui_textbox_background_color);
txtConfigPath->setBackgroundColor(gui_background_color);
txtConfigPath->setForegroundColor(gui_foreground_color);
cmdConfigPath = new gcn::Button("...");
@ -422,7 +422,7 @@ void InitPanelPaths(const config_category& category)
txtNvramFiles->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtNvramFiles->setBaseColor(gui_base_color);
txtNvramFiles->setForegroundColor(gui_foreground_color);
txtNvramFiles->setBackgroundColor(gui_textbox_background_color);
txtNvramFiles->setBackgroundColor(gui_background_color);
cmdNvramFiles = new gcn::Button("...");
cmdNvramFiles->setId("cmdNvramFiles");
@ -435,7 +435,7 @@ void InitPanelPaths(const config_category& category)
txtPluginFiles->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtPluginFiles->setBaseColor(gui_base_color);
txtPluginFiles->setForegroundColor(gui_foreground_color);
txtPluginFiles->setBackgroundColor(gui_textbox_background_color);
txtPluginFiles->setBackgroundColor(gui_background_color);
cmdPluginFiles = new gcn::Button("...");
cmdPluginFiles->setId("cmdPluginFiles");
@ -448,7 +448,7 @@ void InitPanelPaths(const config_category& category)
txtScreenshotFiles->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtScreenshotFiles->setBaseColor(gui_base_color);
txtScreenshotFiles->setForegroundColor(gui_foreground_color);
txtScreenshotFiles->setBackgroundColor(gui_textbox_background_color);
txtScreenshotFiles->setBackgroundColor(gui_background_color);
cmdScreenshotFiles = new gcn::Button("...");
cmdScreenshotFiles->setId("cmdScreenshotFiles");
@ -461,7 +461,7 @@ void InitPanelPaths(const config_category& category)
txtStateFiles->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtStateFiles->setBaseColor(gui_base_color);
txtStateFiles->setForegroundColor(gui_foreground_color);
txtStateFiles->setBackgroundColor(gui_textbox_background_color);
txtStateFiles->setBackgroundColor(gui_background_color);
cmdStateFiles = new gcn::Button("...");
cmdStateFiles->setId("cmdStateFiles");
@ -474,7 +474,7 @@ void InitPanelPaths(const config_category& category)
txtControllersPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtControllersPath->setBaseColor(gui_base_color);
txtControllersPath->setForegroundColor(gui_foreground_color);
txtControllersPath->setBackgroundColor(gui_textbox_background_color);
txtControllersPath->setBackgroundColor(gui_background_color);
cmdControllersPath = new gcn::Button("...");
cmdControllersPath->setId("cmdControllersPath");
@ -488,7 +488,7 @@ void InitPanelPaths(const config_category& category)
txtRetroArchFile->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtRetroArchFile->setBaseColor(gui_base_color);
txtRetroArchFile->setForegroundColor(gui_foreground_color);
txtRetroArchFile->setBackgroundColor(gui_textbox_background_color);
txtRetroArchFile->setBackgroundColor(gui_background_color);
cmdRetroArchFile = new gcn::Button("...");
cmdRetroArchFile->setId("cmdRetroArchFile");
@ -502,7 +502,7 @@ void InitPanelPaths(const config_category& category)
txtWHDBootPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtWHDBootPath->setBaseColor(gui_base_color);
txtWHDBootPath->setForegroundColor(gui_foreground_color);
txtWHDBootPath->setBackgroundColor(gui_textbox_background_color);
txtWHDBootPath->setBackgroundColor(gui_background_color);
cmdWHDBootPath = new gcn::Button("...");
cmdWHDBootPath->setId("cmdWHDBootPath");
@ -516,7 +516,7 @@ void InitPanelPaths(const config_category& category)
txtWHDLoadArchPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtWHDLoadArchPath->setBaseColor(gui_base_color);
txtWHDLoadArchPath->setForegroundColor(gui_foreground_color);
txtWHDLoadArchPath->setBackgroundColor(gui_textbox_background_color);
txtWHDLoadArchPath->setBackgroundColor(gui_background_color);
cmdWHDLoadArchPath = new gcn::Button("...");
cmdWHDLoadArchPath->setId("cmdWHDLoadArchPath");
@ -530,7 +530,7 @@ void InitPanelPaths(const config_category& category)
txtFloppyPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtFloppyPath->setBaseColor(gui_base_color);
txtFloppyPath->setForegroundColor(gui_foreground_color);
txtFloppyPath->setBackgroundColor(gui_textbox_background_color);
txtFloppyPath->setBackgroundColor(gui_background_color);
cmdFloppyPath = new gcn::Button("...");
cmdFloppyPath->setId("cmdFloppyPath");
@ -544,7 +544,7 @@ void InitPanelPaths(const config_category& category)
txtCDPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtCDPath->setBaseColor(gui_base_color);
txtCDPath->setForegroundColor(gui_foreground_color);
txtCDPath->setBackgroundColor(gui_textbox_background_color);
txtCDPath->setBackgroundColor(gui_background_color);
cmdCDPath = new gcn::Button("...");
cmdCDPath->setId("cmdCDPath");
@ -557,7 +557,7 @@ void InitPanelPaths(const config_category& category)
txtHardDrivesPath = new gcn::TextField();
txtHardDrivesPath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtHardDrivesPath->setBaseColor(gui_base_color);
txtHardDrivesPath->setBackgroundColor(gui_textbox_background_color);
txtHardDrivesPath->setBackgroundColor(gui_background_color);
txtHardDrivesPath->setForegroundColor(gui_foreground_color);
cmdHardDrivesPath = new gcn::Button("...");
@ -571,13 +571,13 @@ void InitPanelPaths(const config_category& category)
chkEnableLogging = new gcn::CheckBox("Enable logging", true);
chkEnableLogging->setId("chkEnableLogging");
chkEnableLogging->setBaseColor(gui_base_color);
chkEnableLogging->setBackgroundColor(gui_textbox_background_color);
chkEnableLogging->setBackgroundColor(gui_background_color);
chkEnableLogging->setForegroundColor(gui_foreground_color);
chkEnableLogging->addActionListener(enableLoggingActionListener);
chkLogToConsole = new gcn::CheckBox("Log to console", false);
chkLogToConsole->setId("chkLogToConsole");
chkLogToConsole->setBaseColor(gui_base_color);
chkLogToConsole->setBackgroundColor(gui_textbox_background_color);
chkLogToConsole->setBackgroundColor(gui_background_color);
chkLogToConsole->setForegroundColor(gui_foreground_color);
chkLogToConsole->addActionListener(enableLoggingActionListener);
@ -585,7 +585,7 @@ void InitPanelPaths(const config_category& category)
txtLogfilePath = new gcn::TextField();
txtLogfilePath->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
txtLogfilePath->setBaseColor(gui_base_color);
txtLogfilePath->setBackgroundColor(gui_textbox_background_color);
txtLogfilePath->setBackgroundColor(gui_background_color);
txtLogfilePath->setForegroundColor(gui_foreground_color);
cmdLogfilePath = new gcn::Button("...");
@ -598,7 +598,7 @@ void InitPanelPaths(const config_category& category)
int yPos = DISTANCE_BORDER;
grpPaths->setPosition(DISTANCE_BORDER, DISTANCE_BORDER);
grpPaths->setBaseColor(gui_base_color);
grpPaths->setBackgroundColor(gui_textbox_background_color);
grpPaths->setBackgroundColor(gui_background_color);
grpPaths->add(lblSystemROMs, DISTANCE_BORDER, yPos);
yPos += lblSystemROMs->getHeight() + DISTANCE_NEXT_Y / 2;
@ -683,7 +683,7 @@ void InitPanelPaths(const config_category& category)
scrlPaths = new gcn::ScrollArea(grpPaths);
scrlPaths->setId("scrlPaths");
scrlPaths->setBaseColor(gui_base_color);
scrlPaths->setBackgroundColor(gui_textbox_background_color);
scrlPaths->setBackgroundColor(gui_background_color);
scrlPaths->setForegroundColor(gui_foreground_color);
scrlPaths->setWidth(category.panel->getWidth() - DISTANCE_BORDER * 2);
scrlPaths->setHeight(category.panel->getHeight() - TEXTFIELD_HEIGHT * 6);

22
src/osdep/gui/PanelPrio.cpp
View File

@ -148,7 +148,7 @@ void InitPanelPrio(const config_category& category)
cboActiveRunAtPrio = new gcn::DropDown(&prio_values_list);
cboActiveRunAtPrio->setSize(150, cboActiveRunAtPrio->getHeight());
cboActiveRunAtPrio->setBaseColor(gui_base_color);
cboActiveRunAtPrio->setBackgroundColor(gui_textbox_background_color);
cboActiveRunAtPrio->setBackgroundColor(gui_background_color);
cboActiveRunAtPrio->setForegroundColor(gui_foreground_color);
cboActiveRunAtPrio->setSelectionColor(gui_selection_color);
cboActiveRunAtPrio->setId("cboActiveRunAtPrio");
@ -160,14 +160,14 @@ void InitPanelPrio(const config_category& category)
chkActivePauseEmulation = new gcn::CheckBox("Pause emulation");
chkActivePauseEmulation->setId("chkActivePauseEmulation");
chkActivePauseEmulation->setBaseColor(gui_base_color);
chkActivePauseEmulation->setBackgroundColor(gui_textbox_background_color);
chkActivePauseEmulation->setBackgroundColor(gui_background_color);
chkActivePauseEmulation->setForegroundColor(gui_foreground_color);
chkActivePauseEmulation->addActionListener(prioActionListener);
chkActiveDisableSound = new gcn::CheckBox("Disable sound");
chkActiveDisableSound->setId("chkActiveDisableSound");
chkActiveDisableSound->setBaseColor(gui_base_color);
chkActiveDisableSound->setBackgroundColor(gui_textbox_background_color);
chkActiveDisableSound->setBackgroundColor(gui_background_color);
chkActiveDisableSound->setForegroundColor(gui_foreground_color);
chkActiveDisableSound->addActionListener(prioActionListener);
@ -194,7 +194,7 @@ void InitPanelPrio(const config_category& category)
cboInactiveRunAtPrio = new gcn::DropDown(&prio_values_list);
cboInactiveRunAtPrio->setSize(150, cboInactiveRunAtPrio->getHeight());
cboInactiveRunAtPrio->setBaseColor(gui_base_color);
cboInactiveRunAtPrio->setBackgroundColor(gui_textbox_background_color);
cboInactiveRunAtPrio->setBackgroundColor(gui_background_color);
cboInactiveRunAtPrio->setForegroundColor(gui_foreground_color);
cboInactiveRunAtPrio->setSelectionColor(gui_selection_color);
cboInactiveRunAtPrio->setId("cboInactiveRunAtPrio");
@ -203,21 +203,21 @@ void InitPanelPrio(const config_category& category)
chkInactivePauseEmulation = new gcn::CheckBox("Pause emulation");
chkInactivePauseEmulation->setId("chkInactivePauseEmulation");
chkInactivePauseEmulation->setBaseColor(gui_base_color);
chkInactivePauseEmulation->setBackgroundColor(gui_textbox_background_color);
chkInactivePauseEmulation->setBackgroundColor(gui_background_color);
chkInactivePauseEmulation->setForegroundColor(gui_foreground_color);
chkInactivePauseEmulation->addActionListener(prioActionListener);
chkInactiveDisableSound = new gcn::CheckBox("Disable sound");
chkInactiveDisableSound->setId("chkInactiveDisableSound");
chkInactiveDisableSound->setBaseColor(gui_base_color);
chkInactiveDisableSound->setBackgroundColor(gui_textbox_background_color);
chkInactiveDisableSound->setBackgroundColor(gui_background_color);
chkInactiveDisableSound->setForegroundColor(gui_foreground_color);
chkInactiveDisableSound->addActionListener(prioActionListener);
chkInactiveDisableControllers = new gcn::CheckBox("Disable input");
chkInactiveDisableControllers->setId("chkInactiveDisableControllers");
chkInactiveDisableControllers->setBaseColor(gui_base_color);
chkInactiveDisableControllers->setBackgroundColor(gui_textbox_background_color);
chkInactiveDisableControllers->setBackgroundColor(gui_background_color);
chkInactiveDisableControllers->setForegroundColor(gui_foreground_color);
chkInactiveDisableControllers->addActionListener(prioActionListener);
@ -241,7 +241,7 @@ void InitPanelPrio(const config_category& category)
cboMinimizedRunAtPrio = new gcn::DropDown(&prio_values_list);
cboMinimizedRunAtPrio->setSize(150, cboInactiveRunAtPrio->getHeight());
cboMinimizedRunAtPrio->setBaseColor(gui_base_color);
cboMinimizedRunAtPrio->setBackgroundColor(gui_textbox_background_color);
cboMinimizedRunAtPrio->setBackgroundColor(gui_background_color);
cboMinimizedRunAtPrio->setForegroundColor(gui_foreground_color);
cboMinimizedRunAtPrio->setSelectionColor(gui_selection_color);
cboMinimizedRunAtPrio->setId("cboMinimizedRunAtPrio");
@ -250,21 +250,21 @@ void InitPanelPrio(const config_category& category)
chkMinimizedPauseEmulation = new gcn::CheckBox("Pause emulation");
chkMinimizedPauseEmulation->setId("chkMinimizedPauseEmulation");
chkMinimizedPauseEmulation->setBaseColor(gui_base_color);
chkMinimizedPauseEmulation->setBackgroundColor(gui_textbox_background_color);
chkMinimizedPauseEmulation->setBackgroundColor(gui_background_color);
chkMinimizedPauseEmulation->setForegroundColor(gui_foreground_color);
chkMinimizedPauseEmulation->addActionListener(prioActionListener);
chkMinimizedDisableSound = new gcn::CheckBox("Disable sound");
chkMinimizedDisableSound->setId("chkMinimizedDisableSound");
chkMinimizedDisableSound->setBaseColor(gui_base_color);
chkMinimizedDisableSound->setBackgroundColor(gui_textbox_background_color);
chkMinimizedDisableSound->setBackgroundColor(gui_background_color);
chkMinimizedDisableSound->setForegroundColor(gui_foreground_color);
chkMinimizedDisableSound->addActionListener(prioActionListener);
chkMinimizedDisableControllers = new gcn::CheckBox("Disable input");
chkMinimizedDisableControllers->setId("chkMinimizedDisableControllers");
chkMinimizedDisableControllers->setBaseColor(gui_base_color);
chkMinimizedDisableControllers->setBackgroundColor(gui_textbox_background_color);
chkMinimizedDisableControllers->setBackgroundColor(gui_background_color);
chkMinimizedDisableControllers->setForegroundColor(gui_foreground_color);
chkMinimizedDisableControllers->addActionListener(prioActionListener);

22
src/osdep/gui/PanelQuickstart.cpp
View File

@ -722,7 +722,7 @@ void InitPanelQuickstart(const config_category& category)
cboModel = new gcn::DropDown(&amigaModelList);
cboModel->setSize(160, cboModel->getHeight());
cboModel->setBaseColor(gui_base_color);
cboModel->setBackgroundColor(gui_textbox_background_color);
cboModel->setBackgroundColor(gui_background_color);
cboModel->setForegroundColor(gui_foreground_color);
cboModel->setSelectionColor(gui_selection_color);
cboModel->setId("cboAModel");
@ -734,7 +734,7 @@ void InitPanelQuickstart(const config_category& category)
cboConfig->setSize(category.panel->getWidth() - lblConfig->getWidth() - 8 - 2 * DISTANCE_BORDER,
cboConfig->getHeight());
cboConfig->setBaseColor(gui_base_color);
cboConfig->setBackgroundColor(gui_textbox_background_color);
cboConfig->setBackgroundColor(gui_background_color);
cboConfig->setForegroundColor(gui_foreground_color);
cboConfig->setSelectionColor(gui_selection_color);
cboConfig->setId("cboAConfig");
@ -743,7 +743,7 @@ void InitPanelQuickstart(const config_category& category)
chkNTSC = new gcn::CheckBox("NTSC");
chkNTSC->setId("qsNTSC");
chkNTSC->setBaseColor(gui_base_color);
chkNTSC->setBackgroundColor(gui_textbox_background_color);
chkNTSC->setBackgroundColor(gui_background_color);
chkNTSC->setForegroundColor(gui_foreground_color);
chkNTSC->addActionListener(quickstartActionListener);
@ -755,13 +755,13 @@ void InitPanelQuickstart(const config_category& category)
snprintf(tmp, 20, "qsDF%d", i);
chkqsDFx[i]->setId(tmp);
chkqsDFx[i]->setBaseColor(gui_base_color);
chkqsDFx[i]->setBackgroundColor(gui_textbox_background_color);
chkqsDFx[i]->setBackgroundColor(gui_background_color);
chkqsDFx[i]->setForegroundColor(gui_foreground_color);
chkqsDFx[i]->addActionListener(qs_diskActionListener);
cboqsDFxType[i] = new gcn::DropDown(&qsDriveTypeList);
cboqsDFxType[i]->setBaseColor(gui_base_color);
cboqsDFxType[i]->setBackgroundColor(gui_textbox_background_color);
cboqsDFxType[i]->setBackgroundColor(gui_background_color);
cboqsDFxType[i]->setForegroundColor(gui_foreground_color);
cboqsDFxType[i]->setSelectionColor(gui_selection_color);
snprintf(tmp, 20, "cboqsType%d", i);
@ -772,7 +772,7 @@ void InitPanelQuickstart(const config_category& category)
snprintf(tmp, 20, "qsWP%d", i);
chkqsDFxWriteProtect[i]->setId(tmp);
chkqsDFxWriteProtect[i]->setBaseColor(gui_base_color);
chkqsDFxWriteProtect[i]->setBackgroundColor(gui_textbox_background_color);
chkqsDFxWriteProtect[i]->setBackgroundColor(gui_background_color);
chkqsDFxWriteProtect[i]->setForegroundColor(gui_foreground_color);
chkqsDFxWriteProtect[i]->addActionListener(qs_diskActionListener);
@ -805,7 +805,7 @@ void InitPanelQuickstart(const config_category& category)
cboqsDFxFile[i]->setId(tmp);
cboqsDFxFile[i]->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboqsDFxFile[i]->getHeight());
cboqsDFxFile[i]->setBaseColor(gui_base_color);
cboqsDFxFile[i]->setBackgroundColor(gui_textbox_background_color);
cboqsDFxFile[i]->setBackgroundColor(gui_background_color);
cboqsDFxFile[i]->setForegroundColor(gui_foreground_color);
cboqsDFxFile[i]->setSelectionColor(gui_selection_color);
cboqsDFxFile[i]->addActionListener(qs_diskActionListener);
@ -814,7 +814,7 @@ void InitPanelQuickstart(const config_category& category)
chkCD = new gcn::CheckBox("CD drive");
chkCD->setId("qsCD drive");
chkCD->setBaseColor(gui_base_color);
chkCD->setBackgroundColor(gui_textbox_background_color);
chkCD->setBackgroundColor(gui_background_color);
chkCD->setForegroundColor(gui_foreground_color);
chkCD->setEnabled(false);
@ -835,7 +835,7 @@ void InitPanelQuickstart(const config_category& category)
cboCDFile = new gcn::DropDown(&cdfileList);
cboCDFile->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboCDFile->getHeight());
cboCDFile->setBaseColor(gui_base_color);
cboCDFile->setBackgroundColor(gui_textbox_background_color);
cboCDFile->setBackgroundColor(gui_background_color);
cboCDFile->setForegroundColor(gui_foreground_color);
cboCDFile->setSelectionColor(gui_selection_color);
cboCDFile->setId("cboCD");
@ -844,7 +844,7 @@ void InitPanelQuickstart(const config_category& category)
chkQuickstartMode = new gcn::CheckBox("Start in Quickstart mode");
chkQuickstartMode->setId("qsMode");
chkQuickstartMode->setBaseColor(gui_base_color);
chkQuickstartMode->setBackgroundColor(gui_textbox_background_color);
chkQuickstartMode->setBackgroundColor(gui_background_color);
chkQuickstartMode->setForegroundColor(gui_foreground_color);
chkQuickstartMode->addActionListener(quickstartActionListener);
@ -859,7 +859,7 @@ void InitPanelQuickstart(const config_category& category)
cboWhdload = new gcn::DropDown(&whdloadFileList);
cboWhdload->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboWhdload->getHeight());
cboWhdload->setBaseColor(gui_base_color);
cboWhdload->setBackgroundColor(gui_textbox_background_color);
cboWhdload->setBackgroundColor(gui_background_color);
cboWhdload->setForegroundColor(gui_foreground_color);
cboWhdload->setSelectionColor(gui_selection_color);
cboWhdload->setId("cboQsWhdload");

14
src/osdep/gui/PanelRAM.cpp
View File

@ -99,7 +99,7 @@ void InitPanelRAM(const config_category& category)
sldChipmem = new gcn::Slider(0, 6);
sldChipmem->setSize(sld_width, SLIDER_HEIGHT);
sldChipmem->setBaseColor(gui_base_color);
sldChipmem->setBackgroundColor(gui_textbox_background_color);
sldChipmem->setBackgroundColor(gui_background_color);
sldChipmem->setForegroundColor(gui_foreground_color);
sldChipmem->setMarkerLength(marker_length);
sldChipmem->setStepLength(1);
@ -111,7 +111,7 @@ void InitPanelRAM(const config_category& category)
sldSlowmem = new gcn::Slider(0, 4);
sldSlowmem->setSize(sld_width, SLIDER_HEIGHT);
sldSlowmem->setBaseColor(gui_base_color);
sldSlowmem->setBackgroundColor(gui_textbox_background_color);
sldSlowmem->setBackgroundColor(gui_background_color);
sldSlowmem->setForegroundColor(gui_foreground_color);
sldSlowmem->setMarkerLength(marker_length);
sldSlowmem->setStepLength(1);
@ -123,7 +123,7 @@ void InitPanelRAM(const config_category& category)
sldFastmem = new gcn::Slider(0, 8);
sldFastmem->setSize(sld_width, SLIDER_HEIGHT);
sldFastmem->setBaseColor(gui_base_color);
sldFastmem->setBackgroundColor(gui_textbox_background_color);
sldFastmem->setBackgroundColor(gui_background_color);
sldFastmem->setForegroundColor(gui_foreground_color);
sldFastmem->setMarkerLength(marker_length);
sldFastmem->setStepLength(1);
@ -138,7 +138,7 @@ void InitPanelRAM(const config_category& category)
sldZ3mem = new gcn::Slider(0, 10);
sldZ3mem->setSize(sld_width, SLIDER_HEIGHT);
sldZ3mem->setBaseColor(gui_base_color);
sldZ3mem->setBackgroundColor(gui_textbox_background_color);
sldZ3mem->setBackgroundColor(gui_background_color);
sldZ3mem->setForegroundColor(gui_foreground_color);
sldZ3mem->setMarkerLength(marker_length);
sldZ3mem->setStepLength(1);
@ -153,7 +153,7 @@ void InitPanelRAM(const config_category& category)
sldZ3chip = new gcn::Slider(0, 8);
sldZ3chip->setSize(sld_width, SLIDER_HEIGHT);
sldZ3chip->setBaseColor(gui_base_color);
sldZ3chip->setBackgroundColor(gui_textbox_background_color);
sldZ3chip->setBackgroundColor(gui_background_color);
sldZ3chip->setForegroundColor(gui_foreground_color);
sldZ3chip->setMarkerLength(marker_length);
sldZ3chip->setStepLength(1);
@ -165,7 +165,7 @@ void InitPanelRAM(const config_category& category)
sldMbResLowmem = new gcn::Slider(0, 7);
sldMbResLowmem->setSize(sld_width, SLIDER_HEIGHT);
sldMbResLowmem->setBaseColor(gui_base_color);
sldMbResLowmem->setBackgroundColor(gui_textbox_background_color);
sldMbResLowmem->setBackgroundColor(gui_background_color);
sldMbResLowmem->setForegroundColor(gui_foreground_color);
sldMbResLowmem->setMarkerLength(marker_length);
sldMbResLowmem->setStepLength(1);
@ -177,7 +177,7 @@ void InitPanelRAM(const config_category& category)
sldMbResHighmem = new gcn::Slider(0, 8);
sldMbResHighmem->setSize(sld_width, SLIDER_HEIGHT);
sldMbResHighmem->setBaseColor(gui_base_color);
sldMbResHighmem->setBackgroundColor(gui_textbox_background_color);
sldMbResHighmem->setBackgroundColor(gui_background_color);
sldMbResHighmem->setForegroundColor(gui_foreground_color);
sldMbResHighmem->setMarkerLength(marker_length);
sldMbResHighmem->setStepLength(1);

12
src/osdep/gui/PanelROM.cpp
View File

@ -221,7 +221,7 @@ void InitPanelROM(const config_category& category)
cboMainROM = new gcn::DropDown(mainROMList);
cboMainROM->setSize(textFieldWidth, cboMainROM->getHeight());
cboMainROM->setBaseColor(gui_base_color);
cboMainROM->setBackgroundColor(gui_textbox_background_color);
cboMainROM->setBackgroundColor(gui_background_color);
cboMainROM->setForegroundColor(gui_foreground_color);
cboMainROM->setSelectionColor(gui_selection_color);
cboMainROM->setId("cboMainROM");
@ -237,7 +237,7 @@ void InitPanelROM(const config_category& category)
cboExtROM = new gcn::DropDown(extROMList);
cboExtROM->setSize(textFieldWidth, cboExtROM->getHeight());
cboExtROM->setBaseColor(gui_base_color);
cboExtROM->setBackgroundColor(gui_textbox_background_color);
cboExtROM->setBackgroundColor(gui_background_color);
cboExtROM->setForegroundColor(gui_foreground_color);
cboExtROM->setSelectionColor(gui_selection_color);
cboExtROM->setId("cboExtROM");
@ -252,14 +252,14 @@ void InitPanelROM(const config_category& category)
chkMapRom = new gcn::CheckBox("MapROM emulation");
chkMapRom->setId("chkMapRom");
chkMapRom->setBaseColor(gui_base_color);
chkMapRom->setBackgroundColor(gui_textbox_background_color);
chkMapRom->setBackgroundColor(gui_background_color);
chkMapRom->setForegroundColor(gui_foreground_color);
chkMapRom->addActionListener(romButtonActionListener);
chkShapeShifter = new gcn::CheckBox("ShapeShifter support");
chkShapeShifter->setId("chkShapeShifter");
chkShapeShifter->setBaseColor(gui_base_color);
chkShapeShifter->setBackgroundColor(gui_textbox_background_color);
chkShapeShifter->setBackgroundColor(gui_background_color);
chkShapeShifter->setForegroundColor(gui_foreground_color);
chkShapeShifter->addActionListener(romButtonActionListener);
@ -267,7 +267,7 @@ void InitPanelROM(const config_category& category)
cboCartROM = new gcn::DropDown(cartROMList);
cboCartROM->setSize(textFieldWidth, cboCartROM->getHeight());
cboCartROM->setBaseColor(gui_base_color);
cboCartROM->setBackgroundColor(gui_textbox_background_color);
cboCartROM->setBackgroundColor(gui_background_color);
cboCartROM->setForegroundColor(gui_foreground_color);
cboCartROM->setSelectionColor(gui_selection_color);
cboCartROM->setId("cboCartROM");
@ -283,7 +283,7 @@ void InitPanelROM(const config_category& category)
cboUAEROM = new gcn::DropDown(&uaeList);
cboUAEROM->setSize(textFieldWidth, cboUAEROM->getHeight());
cboUAEROM->setBaseColor(gui_base_color);
cboUAEROM->setBackgroundColor(gui_textbox_background_color);\
cboUAEROM->setBackgroundColor(gui_background_color);\
cboUAEROM->setForegroundColor(gui_foreground_color);
cboUAEROM->setSelectionColor(gui_selection_color);
cboUAEROM->setId("cboUAEROM");

28
src/osdep/gui/PanelRTG.cpp
View File

@ -196,7 +196,7 @@ void InitPanelRTG(const config_category& category)
cboBoard = new gcn::DropDown(&rtg_boards_list);
cboBoard->setSize(300, cboBoard->getHeight());
cboBoard->setBaseColor(gui_base_color);
cboBoard->setBackgroundColor(gui_textbox_background_color);
cboBoard->setBackgroundColor(gui_background_color);
cboBoard->setForegroundColor(gui_foreground_color);
cboBoard->setSelectionColor(gui_selection_color);
cboBoard->setId("cboBoard");
@ -207,7 +207,7 @@ void InitPanelRTG(const config_category& category)
sldGfxmem = new gcn::Slider(0, 8);
sldGfxmem->setSize(cboBoard->getWidth() - lblGfxmem->getWidth() - lblGfxsize->getWidth(), SLIDER_HEIGHT);
sldGfxmem->setBaseColor(gui_base_color);
sldGfxmem->setBackgroundColor(gui_textbox_background_color);
sldGfxmem->setBackgroundColor(gui_background_color);
sldGfxmem->setForegroundColor(gui_foreground_color);
sldGfxmem->setMarkerLength(marker_length);
sldGfxmem->setStepLength(1);
@ -217,49 +217,49 @@ void InitPanelRTG(const config_category& category)
chkRtgMatchDepth = new gcn::CheckBox("Match host and RTG color depth if possible");
chkRtgMatchDepth->setId("chkRtgMatchDepth");
chkRtgMatchDepth->setBaseColor(gui_base_color);
chkRtgMatchDepth->setBackgroundColor(gui_textbox_background_color);
chkRtgMatchDepth->setBackgroundColor(gui_background_color);
chkRtgMatchDepth->setForegroundColor(gui_foreground_color);
chkRtgMatchDepth->addActionListener(rtg_action_listener);
chkRtgAutoscale = new gcn::CheckBox("Scale if smaller than display size setting");
chkRtgAutoscale->setId("chkRtgAutoscale");
chkRtgAutoscale->setBaseColor(gui_base_color);
chkRtgAutoscale->setBackgroundColor(gui_textbox_background_color);
chkRtgAutoscale->setBackgroundColor(gui_background_color);
chkRtgAutoscale->setForegroundColor(gui_foreground_color);
chkRtgAutoscale->addActionListener(rtg_action_listener);
chkRtgAllowScaling = new gcn::CheckBox("Always scale in windowed mode");
chkRtgAllowScaling->setId("chkRtgAllowScaling");
chkRtgAllowScaling->setBaseColor(gui_base_color);
chkRtgAllowScaling->setBackgroundColor(gui_textbox_background_color);
chkRtgAllowScaling->setBackgroundColor(gui_background_color);
chkRtgAllowScaling->setForegroundColor(gui_foreground_color);
chkRtgAllowScaling->addActionListener(rtg_action_listener);
chkRtgAlwaysCenter = new gcn::CheckBox("Always center");
chkRtgAlwaysCenter->setId("chkRtgAlwaysCenter");
chkRtgAlwaysCenter->setBaseColor(gui_base_color);
chkRtgAlwaysCenter->setBackgroundColor(gui_textbox_background_color);
chkRtgAlwaysCenter->setBackgroundColor(gui_background_color);
chkRtgAlwaysCenter->setForegroundColor(gui_foreground_color);
chkRtgAlwaysCenter->addActionListener(rtg_action_listener);
chkRtgHardwareInterrupt = new gcn::CheckBox("Hardware vertical blank interrupt");
chkRtgHardwareInterrupt->setId("chkRtgHardwareInterrupt");
chkRtgHardwareInterrupt->setBaseColor(gui_base_color);
chkRtgHardwareInterrupt->setBackgroundColor(gui_textbox_background_color);
chkRtgHardwareInterrupt->setBackgroundColor(gui_background_color);
chkRtgHardwareInterrupt->setForegroundColor(gui_foreground_color);
chkRtgHardwareInterrupt->addActionListener(rtg_action_listener);
chkRtgHardwareSprite = new gcn::CheckBox("Hardware sprite emulation");
chkRtgHardwareSprite->setId("chkRtgHardwareSprite");
chkRtgHardwareSprite->setBaseColor(gui_base_color);
chkRtgHardwareSprite->setBackgroundColor(gui_textbox_background_color);
chkRtgHardwareSprite->setBackgroundColor(gui_background_color);
chkRtgHardwareSprite->setForegroundColor(gui_foreground_color);
chkRtgHardwareSprite->addActionListener(rtg_action_listener);
chkRtgMultithreaded = new gcn::CheckBox("Multithreaded");
chkRtgMultithreaded->setId("chkRtgMultithreaded");
chkRtgMultithreaded->setBaseColor(gui_base_color);
chkRtgMultithreaded->setBackgroundColor(gui_textbox_background_color);
chkRtgMultithreaded->setBackgroundColor(gui_background_color);
chkRtgMultithreaded->setForegroundColor(gui_foreground_color);
chkRtgMultithreaded->addActionListener(rtg_action_listener);
@ -268,7 +268,7 @@ void InitPanelRTG(const config_category& category)
cboRtgRefreshRate = new gcn::DropDown(&rtg_refreshrates_list);
cboRtgRefreshRate->setSize(150, cboRtgRefreshRate->getHeight());
cboRtgRefreshRate->setBaseColor(gui_base_color);
cboRtgRefreshRate->setBackgroundColor(gui_textbox_background_color);
cboRtgRefreshRate->setBackgroundColor(gui_background_color);
cboRtgRefreshRate->setForegroundColor(gui_foreground_color);
cboRtgRefreshRate->setSelectionColor(gui_selection_color);
cboRtgRefreshRate->setId("cboRtgRefreshRate");
@ -279,7 +279,7 @@ void InitPanelRTG(const config_category& category)
cboRtgBufferMode = new gcn::DropDown(&rtg_buffermodes_list);
cboRtgBufferMode->setSize(150, cboRtgBufferMode->getHeight());
cboRtgBufferMode->setBaseColor(gui_base_color);
cboRtgBufferMode->setBackgroundColor(gui_textbox_background_color);
cboRtgBufferMode->setBackgroundColor(gui_background_color);
cboRtgBufferMode->setForegroundColor(gui_foreground_color);
cboRtgBufferMode->setSelectionColor(gui_selection_color);
cboRtgBufferMode->setId("cboRtgBufferMode");
@ -290,7 +290,7 @@ void InitPanelRTG(const config_category& category)
cboRtgAspectRatio = new gcn::DropDown(&rtg_aspectratios_list);
cboRtgAspectRatio->setSize(150, cboRtgAspectRatio->getHeight());
cboRtgAspectRatio->setBaseColor(gui_base_color);
cboRtgAspectRatio->setBackgroundColor(gui_textbox_background_color);
cboRtgAspectRatio->setBackgroundColor(gui_background_color);
cboRtgAspectRatio->setForegroundColor(gui_foreground_color);
cboRtgAspectRatio->setSelectionColor(gui_selection_color);
cboRtgAspectRatio->setId("cboRtgAspectRatio");
@ -302,7 +302,7 @@ void InitPanelRTG(const config_category& category)
cboRtg16bitModes = new gcn::DropDown(&rtg_16bit_modes_list);
cboRtg16bitModes->setSize(150, cboRtg16bitModes->getHeight());
cboRtg16bitModes->setBaseColor(gui_base_color);
cboRtg16bitModes->setBackgroundColor(gui_textbox_background_color);
cboRtg16bitModes->setBackgroundColor(gui_background_color);
cboRtg16bitModes->setForegroundColor(gui_foreground_color);
cboRtg16bitModes->setSelectionColor(gui_selection_color);
cboRtg16bitModes->setId("cboRtg16bitModes");
@ -311,7 +311,7 @@ void InitPanelRTG(const config_category& category)
cboRtg32bitModes = new gcn::DropDown(&rtg_32bit_modes_list);
cboRtg32bitModes->setSize(150, cboRtg32bitModes->getHeight());
cboRtg32bitModes->setBaseColor(gui_base_color);
cboRtg32bitModes->setBackgroundColor(gui_textbox_background_color);
cboRtg32bitModes->setBackgroundColor(gui_background_color);
cboRtg32bitModes->setForegroundColor(gui_foreground_color);
cboRtg32bitModes->setSelectionColor(gui_selection_color);
cboRtg32bitModes->setId("cboRtg32bitModes");

2
src/osdep/gui/PanelSavestate.cpp
View File

@ -126,7 +126,7 @@ void InitPanelSavestate(const config_category& category)
radioButtons[i] = new gcn::RadioButton(std::to_string(i), "radiostategroup");
radioButtons[i]->setId("State" + std::to_string(i));
radioButtons[i]->setBaseColor(gui_base_color);
radioButtons[i]->setBackgroundColor(gui_textbox_background_color);
radioButtons[i]->setBackgroundColor(gui_background_color);
radioButtons[i]->setForegroundColor(gui_foreground_color);
radioButtons[i]->addActionListener(savestateActionListener);
}

46
src/osdep/gui/PanelSound.cpp
View File

@ -317,7 +317,7 @@ void InitPanelSound(const config_category& category)
cboSoundcard = new gcn::DropDown(&soundcard_list);
cboSoundcard->setSize(category.panel->getWidth() - lblSoundcard->getWidth() - 8 - DISTANCE_BORDER * 2, cboSoundcard->getHeight());
cboSoundcard->setBaseColor(gui_base_color);
cboSoundcard->setBackgroundColor(gui_textbox_background_color);
cboSoundcard->setBackgroundColor(gui_background_color);
cboSoundcard->setForegroundColor(gui_foreground_color);
cboSoundcard->setSelectionColor(gui_selection_color);
cboSoundcard->setId("cboSoundcard");
@ -326,35 +326,35 @@ void InitPanelSound(const config_category& category)
chkSystemDefault = new gcn::CheckBox("System default");
chkSystemDefault->setId("chkSystemDefault");
chkSystemDefault->setBaseColor(gui_base_color);
chkSystemDefault->setBackgroundColor(gui_textbox_background_color);
chkSystemDefault->setBackgroundColor(gui_background_color);
chkSystemDefault->setForegroundColor(gui_foreground_color);
chkSystemDefault->addActionListener(sound_action_listener);
optSoundDisabled = new gcn::RadioButton("Disabled", "radiosoundgroup");
optSoundDisabled->setId("sndDisable");
optSoundDisabled->setBaseColor(gui_base_color);
optSoundDisabled->setBackgroundColor(gui_textbox_background_color);
optSoundDisabled->setBackgroundColor(gui_background_color);
optSoundDisabled->setForegroundColor(gui_foreground_color);
optSoundDisabled->addActionListener(sound_action_listener);
optSoundDisabledEmu = new gcn::RadioButton("Disabled, but emulated", "radiosoundgroup");
optSoundDisabledEmu->setId("sndDisEmu");
optSoundDisabledEmu->setBaseColor(gui_base_color);
optSoundDisabledEmu->setBackgroundColor(gui_textbox_background_color);
optSoundDisabledEmu->setBackgroundColor(gui_background_color);
optSoundDisabledEmu->setForegroundColor(gui_foreground_color);
optSoundDisabledEmu->addActionListener(sound_action_listener);
optSoundEmulated = new gcn::RadioButton("Enabled", "radiosoundgroup");
optSoundEmulated->setId("sndEmulate");
optSoundEmulated->setBaseColor(gui_base_color);
optSoundEmulated->setBackgroundColor(gui_textbox_background_color);
optSoundEmulated->setBackgroundColor(gui_background_color);
optSoundEmulated->setForegroundColor(gui_foreground_color);
optSoundEmulated->addActionListener(sound_action_listener);
chkAutoSwitching = new gcn::CheckBox("Automatic switching");
chkAutoSwitching->setId("chkAutoSwitching");
chkAutoSwitching->setBaseColor(gui_base_color);
chkAutoSwitching->setBackgroundColor(gui_textbox_background_color);
chkAutoSwitching->setBackgroundColor(gui_background_color);
chkAutoSwitching->setForegroundColor(gui_foreground_color);
chkAutoSwitching->addActionListener(sound_action_listener);
@ -363,7 +363,7 @@ void InitPanelSound(const config_category& category)
cboFrequency = new gcn::DropDown(&frequency_type_list);
cboFrequency->setSize(90, cboFrequency->getHeight());
cboFrequency->setBaseColor(gui_base_color);
cboFrequency->setBackgroundColor(gui_textbox_background_color);
cboFrequency->setBackgroundColor(gui_background_color);
cboFrequency->setForegroundColor(gui_foreground_color);
cboFrequency->setSelectionColor(gui_selection_color);
cboFrequency->setId("cboFrequency");
@ -374,7 +374,7 @@ void InitPanelSound(const config_category& category)
cboSwapChannels = new gcn::DropDown(&swap_channels_list);
cboSwapChannels->setSize(95, cboSwapChannels->getHeight());
cboSwapChannels->setBaseColor(gui_base_color);
cboSwapChannels->setBackgroundColor(gui_textbox_background_color);
cboSwapChannels->setBackgroundColor(gui_background_color);
cboSwapChannels->setForegroundColor(gui_foreground_color);
cboSwapChannels->setSelectionColor(gui_selection_color);
cboSwapChannels->setId("cboSwapChannels");
@ -385,7 +385,7 @@ void InitPanelSound(const config_category& category)
cboChannelMode = new gcn::DropDown(&channel_mode_list);
cboChannelMode->setSize(200, cboChannelMode->getHeight());
cboChannelMode->setBaseColor(gui_base_color);
cboChannelMode->setBackgroundColor(gui_textbox_background_color);
cboChannelMode->setBackgroundColor(gui_background_color);
cboChannelMode->setForegroundColor(gui_foreground_color);
cboChannelMode->setSelectionColor(gui_selection_color);
cboChannelMode->setId("cboChannelMode");
@ -396,7 +396,7 @@ void InitPanelSound(const config_category& category)
cboInterpolation = new gcn::DropDown(&interpolation_type_list);
cboInterpolation->setSize(200, cboInterpolation->getHeight());
cboInterpolation->setBaseColor(gui_base_color);
cboInterpolation->setBackgroundColor(gui_textbox_background_color);
cboInterpolation->setBackgroundColor(gui_background_color);
cboInterpolation->setForegroundColor(gui_foreground_color);
cboInterpolation->setSelectionColor(gui_selection_color);
cboInterpolation->setId("cboInterpol");
@ -407,7 +407,7 @@ void InitPanelSound(const config_category& category)
cboFilter = new gcn::DropDown(&filter_type_list);
cboFilter->setSize(200, cboFilter->getHeight());
cboFilter->setBaseColor(gui_base_color);
cboFilter->setBackgroundColor(gui_textbox_background_color);
cboFilter->setBackgroundColor(gui_background_color);
cboFilter->setForegroundColor(gui_foreground_color);
cboFilter->setSelectionColor(gui_selection_color);
cboFilter->setId("cboFilter");
@ -418,7 +418,7 @@ void InitPanelSound(const config_category& category)
cboSeparation = new gcn::DropDown(&separation_list);
cboSeparation->setSize(120, cboSeparation->getHeight());
cboSeparation->setBaseColor(gui_base_color);
cboSeparation->setBackgroundColor(gui_textbox_background_color);
cboSeparation->setBackgroundColor(gui_background_color);
cboSeparation->setForegroundColor(gui_foreground_color);
cboSeparation->setSelectionColor(gui_selection_color);
cboSeparation->setId("cboSeparation");
@ -429,7 +429,7 @@ void InitPanelSound(const config_category& category)
cboStereoDelay = new gcn::DropDown(&stereo_delay_list);
cboStereoDelay->setSize(120, cboStereoDelay->getHeight());
cboStereoDelay->setBaseColor(gui_base_color);
cboStereoDelay->setBackgroundColor(gui_textbox_background_color);
cboStereoDelay->setBackgroundColor(gui_background_color);
cboStereoDelay->setForegroundColor(gui_foreground_color);
cboStereoDelay->setSelectionColor(gui_selection_color);
cboStereoDelay->setId("cboStereoDelay");
@ -440,7 +440,7 @@ void InitPanelSound(const config_category& category)
sldPaulaVol = new gcn::Slider(0, 100);
sldPaulaVol->setSize(150, SLIDER_HEIGHT);
sldPaulaVol->setBaseColor(gui_base_color);
sldPaulaVol->setBackgroundColor(gui_textbox_background_color);
sldPaulaVol->setBackgroundColor(gui_background_color);
sldPaulaVol->setForegroundColor(gui_foreground_color);
sldPaulaVol->setMarkerLength(20);
sldPaulaVol->setStepLength(10);
@ -453,7 +453,7 @@ void InitPanelSound(const config_category& category)
sldCDVol = new gcn::Slider(0, 100);
sldCDVol->setSize(150, SLIDER_HEIGHT);
sldCDVol->setBaseColor(gui_base_color);
sldCDVol->setBackgroundColor(gui_textbox_background_color);
sldCDVol->setBackgroundColor(gui_background_color);
sldCDVol->setForegroundColor(gui_foreground_color);
sldCDVol->setMarkerLength(20);
sldCDVol->setStepLength(10);
@ -466,7 +466,7 @@ void InitPanelSound(const config_category& category)
sldAHIVol = new gcn::Slider(0, 100);
sldAHIVol->setSize(150, SLIDER_HEIGHT);
sldAHIVol->setBaseColor(gui_base_color);
sldAHIVol->setBackgroundColor(gui_textbox_background_color);
sldAHIVol->setBackgroundColor(gui_background_color);
sldAHIVol->setForegroundColor(gui_foreground_color);
sldAHIVol->setMarkerLength(20);
sldAHIVol->setStepLength(10);
@ -479,7 +479,7 @@ void InitPanelSound(const config_category& category)
sldMIDIVol = new gcn::Slider(0, 100);
sldMIDIVol->setSize(150, SLIDER_HEIGHT);
sldMIDIVol->setBaseColor(gui_base_color);
sldMIDIVol->setBackgroundColor(gui_textbox_background_color);
sldMIDIVol->setBackgroundColor(gui_background_color);
sldMIDIVol->setForegroundColor(gui_foreground_color);
sldMIDIVol->setMarkerLength(20);
sldMIDIVol->setStepLength(10);
@ -490,14 +490,14 @@ void InitPanelSound(const config_category& category)
chkFloppySound = new gcn::CheckBox("Enable floppy drive sound");
chkFloppySound->setId("chkFloppySound");
chkFloppySound->setBaseColor(gui_base_color);
chkFloppySound->setBackgroundColor(gui_textbox_background_color);
chkFloppySound->setBackgroundColor(gui_background_color);
chkFloppySound->setForegroundColor(gui_foreground_color);
chkFloppySound->addActionListener(sound_action_listener);
sldFloppySoundEmpty = new gcn::Slider(0, 100);
sldFloppySoundEmpty->setSize(100, SLIDER_HEIGHT);
sldFloppySoundEmpty->setBaseColor(gui_base_color);
sldFloppySoundEmpty->setBackgroundColor(gui_textbox_background_color);
sldFloppySoundEmpty->setBackgroundColor(gui_background_color);
sldFloppySoundEmpty->setForegroundColor(gui_foreground_color);
sldFloppySoundEmpty->setMarkerLength(20);
sldFloppySoundEmpty->setStepLength(10);
@ -509,7 +509,7 @@ void InitPanelSound(const config_category& category)
sldFloppySoundDisk = new gcn::Slider(0, 100);
sldFloppySoundDisk->setSize(100, SLIDER_HEIGHT);
sldFloppySoundDisk->setBaseColor(gui_base_color);
sldFloppySoundDisk->setBackgroundColor(gui_textbox_background_color);
sldFloppySoundDisk->setBackgroundColor(gui_background_color);
sldFloppySoundDisk->setForegroundColor(gui_foreground_color);
sldFloppySoundDisk->setMarkerLength(20);
sldFloppySoundDisk->setStepLength(10);
@ -521,7 +521,7 @@ void InitPanelSound(const config_category& category)
sldSoundBufferSize = new gcn::Slider(0, 10);
sldSoundBufferSize->setSize(170, SLIDER_HEIGHT);
sldSoundBufferSize->setBaseColor(gui_base_color);
sldSoundBufferSize->setBackgroundColor(gui_textbox_background_color);
sldSoundBufferSize->setBackgroundColor(gui_background_color);
sldSoundBufferSize->setForegroundColor(gui_foreground_color);
sldSoundBufferSize->setMarkerLength(20);
sldSoundBufferSize->setStepLength(1);
@ -532,14 +532,14 @@ void InitPanelSound(const config_category& category)
optSoundPull = new gcn::RadioButton("Pull audio", "radioaudiomethod");
optSoundPull->setId("optSoundPull");
optSoundPull->setBaseColor(gui_base_color);
optSoundPull->setBackgroundColor(gui_textbox_background_color);
optSoundPull->setBackgroundColor(gui_background_color);
optSoundPull->setForegroundColor(gui_foreground_color);
optSoundPull->addActionListener(sound_action_listener);
optSoundPush = new gcn::RadioButton("Push audio", "radioaudiomethod");
optSoundPush->setId("optSoundPush");
optSoundPush->setBaseColor(gui_base_color);
optSoundPush->setBackgroundColor(gui_textbox_background_color);
optSoundPush->setBackgroundColor(gui_background_color);
optSoundPush->setForegroundColor(gui_foreground_color);
optSoundPush->addActionListener(sound_action_listener);

493
src/osdep/gui/PanelThemes.cpp Normal file
View File

@ -0,0 +1,493 @@
#include <cstring>
#include <cstdio>
#include <vector>
#include <guisan.hpp>
#include <guisan/sdl.hpp>
#include "SelectorEntry.hpp"
#include "sysdeps.h"
#include "options.h"
#include "gui_handling.h"
#include "StringListModel.h"
static gcn::Label* lblThemePreset;
static gcn::DropDown* cboThemePreset;
static gcn::Label* lblThemeFont;
static gcn::TextField* txtThemeFont;
static gcn::Button* cmdThemeFont;
static gcn::Label* lblThemeFontSize;
static gcn::TextField* txtThemeFontSize;
struct RGBColorComponents {
gcn::Window* group;
gcn::Label* labelR;
gcn::Slider* sliderR;
gcn::Label* valueR;
gcn::Label* labelG;
gcn::Slider* sliderG;
gcn::Label* valueG;
gcn::Label* labelB;
gcn::Slider* sliderB;
gcn::Label* valueB;
gcn::Window* colorBox;
};
static RGBColorComponents themeFontColor;
static RGBColorComponents themeBaseColor;
static RGBColorComponents themeSelectorInactiveColor;
static RGBColorComponents themeSelectorActiveColor;
static RGBColorComponents themeSelectionColor;
static RGBColorComponents themeTextBgColor;
static RGBColorComponents themeFgColor;
// Save, Reset and Load buttons
static gcn::Button* cmdThemeSave;
static gcn::Button* cmdThemeSaveAs;
static gcn::Button* cmdThemeReset;
static gcn::Button* cmdThemeUse;
static gcn::StringListModel themes_list;
constexpr int slider_width = 150;
constexpr int marker_length = 20;
// populate the themes_list with all filenames under the themes directory
static void populate_themes_list()
{
themes_list.clear();
const std::string themes_dir = get_themes_path();
std::vector<std::string> files;
read_directory(themes_dir, nullptr, &files);
for (const auto& file : files)
{
themes_list.add(file);
}
}
class ThemesActionListener : public gcn::ActionListener
{
void action(const gcn::ActionEvent& actionEvent) override
{
const auto source = actionEvent.getSource();
if (source == cmdThemeFont)
{
const char* filter[] = { ".ttf", "\0" };
const std::string font = SelectFile("Select font", "/usr/share/fonts/truetype/", filter, false);
if (!font.empty())
{
txtThemeFont->setText(font);
gui_theme.font_name = font;
}
}
else if (source == cmdThemeReset)
{
load_default_theme();
}
else if (source == cmdThemeSave)
{
save_theme(amiberry_options.gui_theme);
}
else if (source == cmdThemeSaveAs)
{
const char* filter[] = { ".theme", "\0" };
const std::string theme = SelectFile("Save theme", get_themes_path(), filter, true);
if (!theme.empty())
{
std::string filename = extract_filename(theme);
save_theme(filename);
populate_themes_list();
}
}
else if (source == cmdThemeUse)
{
apply_theme();
}
else if (source == cboThemePreset)
{
const auto selected_theme = cboThemePreset->getSelected();
if (selected_theme >= 0 && selected_theme < themes_list.getNumberOfElements())
{
const auto theme = themes_list.getElementAt(selected_theme);
if (std::strcmp(theme.c_str(), amiberry_options.gui_theme) != 0)
{
std::strcpy(amiberry_options.gui_theme, theme.c_str());
load_theme(theme);
apply_theme();
}
}
}
else
{
HandleSliderAction(source);
}
RefreshPanelThemes();
}
static void HandleSliderAction(const gcn::Widget* source) {
if (source == themeFontColor.sliderR) {
UpdateColorComponent(gui_theme.font_color.r, themeFontColor.sliderR, themeFontColor.valueR);
}
else if (source == themeFontColor.sliderG) {
UpdateColorComponent(gui_theme.font_color.g, themeFontColor.sliderG, themeFontColor.valueG);
}
else if (source == themeFontColor.sliderB) {
UpdateColorComponent(gui_theme.font_color.b, themeFontColor.sliderB, themeFontColor.valueB);
}
else if (source == themeBaseColor.sliderR) {
UpdateColorComponent(gui_theme.base_color.r, themeBaseColor.sliderR, themeBaseColor.valueR);
}
else if (source == themeBaseColor.sliderG) {
UpdateColorComponent(gui_theme.base_color.g, themeBaseColor.sliderG, themeBaseColor.valueG);
}
else if (source == themeBaseColor.sliderB) {
UpdateColorComponent(gui_theme.base_color.b, themeBaseColor.sliderB, themeBaseColor.valueB);
}
else if (source == themeSelectorInactiveColor.sliderR) {
UpdateColorComponent(gui_theme.selector_inactive.r, themeSelectorInactiveColor.sliderR, themeSelectorInactiveColor.valueR);
}
else if (source == themeSelectorInactiveColor.sliderG) {
UpdateColorComponent(gui_theme.selector_inactive.g, themeSelectorInactiveColor.sliderG, themeSelectorInactiveColor.valueG);
}
else if (source == themeSelectorInactiveColor.sliderB) {
UpdateColorComponent(gui_theme.selector_inactive.b, themeSelectorInactiveColor.sliderB, themeSelectorInactiveColor.valueB);
}
else if (source == themeSelectorActiveColor.sliderR) {
UpdateColorComponent(gui_theme.selector_active.r, themeSelectorActiveColor.sliderR, themeSelectorActiveColor.valueR);
}
else if (source == themeSelectorActiveColor.sliderG) {
UpdateColorComponent(gui_theme.selector_active.g, themeSelectorActiveColor.sliderG, themeSelectorActiveColor.valueG);
}
else if (source == themeSelectorActiveColor.sliderB) {
UpdateColorComponent(gui_theme.selector_active.b, themeSelectorActiveColor.sliderB, themeSelectorActiveColor.valueB);
}
else if (source == themeSelectionColor.sliderR) {
UpdateColorComponent(gui_theme.selection_color.r, themeSelectionColor.sliderR, themeSelectionColor.valueR);
}
else if (source == themeSelectionColor.sliderG) {
UpdateColorComponent(gui_theme.selection_color.g, themeSelectionColor.sliderG, themeSelectionColor.valueG);
}
else if (source == themeSelectionColor.sliderB) {
UpdateColorComponent(gui_theme.selection_color.b, themeSelectionColor.sliderB, themeSelectionColor.valueB);
}
else if (source == themeTextBgColor.sliderR) {
UpdateColorComponent(gui_theme.background_color.r, themeTextBgColor.sliderR, themeTextBgColor.valueR);
}
else if (source == themeTextBgColor.sliderG) {
UpdateColorComponent(gui_theme.background_color.g, themeTextBgColor.sliderG, themeTextBgColor.valueG);
}
else if (source == themeTextBgColor.sliderB) {
UpdateColorComponent(gui_theme.background_color.b, themeTextBgColor.sliderB, themeTextBgColor.valueB);
}
else if (source == themeFgColor.sliderR) {
UpdateColorComponent(gui_theme.foreground_color.r, themeFgColor.sliderR, themeFgColor.valueR);
}
else if (source == themeFgColor.sliderG) {
UpdateColorComponent(gui_theme.foreground_color.g, themeFgColor.sliderG, themeFgColor.valueG);
}
else if (source == themeFgColor.sliderB) {
UpdateColorComponent(gui_theme.foreground_color.b, themeFgColor.sliderB, themeFgColor.valueB);
}
}
static void UpdateColorComponent(int& colorComponent, const gcn::Slider* slider, gcn::Label* label) {
colorComponent = static_cast<int>(slider->getValue());
label->setCaption(std::to_string(slider->getValue()));
}
};
static ThemesActionListener* themesActionListener;
gcn::Slider* CreateSlider() {
auto slider = new gcn::Slider(0, 255);
slider->setSize(slider_width, SLIDER_HEIGHT);
slider->setBaseColor(gui_base_color);
slider->setBackgroundColor(gui_background_color);
slider->setForegroundColor(gui_foreground_color);
slider->setMarkerLength(marker_length);
slider->setStepLength(1);
slider->addActionListener(themesActionListener);
return slider;
}
gcn::Button* CreateButton(const std::string& caption, const std::string& id) {
auto button = new gcn::Button(caption);
button->setId(id);
button->setSize(BUTTON_WIDTH, BUTTON_HEIGHT);
button->setBaseColor(gui_base_color);
button->setForegroundColor(gui_foreground_color);
button->addActionListener(themesActionListener);
return button;
}
gcn::Button* CreateSmallButton(const std::string& caption, const std::string& id) {
auto button = new gcn::Button(caption);
button->setId(id);
button->setSize(100, SMALL_BUTTON_HEIGHT);
button->setBaseColor(gui_base_color);
button->setForegroundColor(gui_foreground_color);
button->addActionListener(themesActionListener);
return button;
}
gcn::DropDown* CreateDropDown(const std::string& id) {
auto dropDown = new gcn::DropDown(&themes_list);
dropDown->setSize(200, dropDown->getHeight());
dropDown->setId(id);
dropDown->setBaseColor(gui_base_color);
dropDown->setBackgroundColor(gui_background_color);
dropDown->setForegroundColor(gui_foreground_color);
dropDown->setSelectionColor(gui_selection_color);
dropDown->addActionListener(themesActionListener);
return dropDown;
}
void InitRGBColorComponents(RGBColorComponents& components, const std::string& title) {
components.labelR = new gcn::Label("R:");
components.sliderR = CreateSlider();
components.valueR = new gcn::Label("255");
components.labelG = new gcn::Label("G:");
components.sliderG = CreateSlider();
components.valueG = new gcn::Label("255");
components.labelB = new gcn::Label("B:");
components.sliderB = CreateSlider();
components.valueB = new gcn::Label("255");
components.colorBox = new gcn::Window();
components.colorBox->setSize(50, 50);
components.colorBox->setMovable(false);
components.colorBox->setTitleBarHeight(1);
components.colorBox->setFrameSize(0);
components.group = new gcn::Window(title);
components.group->setBaseColor(gui_base_color);
components.group->setForegroundColor(gui_foreground_color);
components.group->setMovable(false);
components.group->setTitleBarHeight(TITLEBAR_HEIGHT);
components.group->add(components.labelR, 10, 10);
components.group->add(components.sliderR, components.labelR->getX() + components.labelR->getWidth() + 8, 10);
components.group->add(components.valueR, components.sliderR->getX() + components.sliderR->getWidth() + 8, 10);
components.group->add(components.labelG, 10, 40);
components.group->add(components.sliderG, components.sliderR->getX(), 40);
components.group->add(components.valueG, components.sliderG->getX() + components.sliderG->getWidth() + 8, 40);
components.group->add(components.labelB, 10, 70);
components.group->add(components.sliderB, components.sliderR->getX(), 70);
components.group->add(components.valueB, components.sliderB->getX() + components.sliderB->getWidth() + 8, 70);
components.group->add(components.colorBox, components.valueR->getX() + components.valueR->getWidth() + 8, 10);
const int grp_width = components.colorBox->getX() + components.colorBox->getWidth() + DISTANCE_BORDER;
const int grp_height = components.labelB->getY() + components.labelB->getHeight() + DISTANCE_BORDER + 5;
components.group->setSize(grp_width, TITLEBAR_HEIGHT + grp_height);
}
void PositionComponents(const config_category& category) {
int pos_x = DISTANCE_BORDER;
int pos_y = DISTANCE_BORDER;
category.panel->add(lblThemePreset, pos_x, pos_y);
pos_x += lblThemePreset->getWidth() + 8;
category.panel->add(cboThemePreset, pos_x, pos_y);
pos_x += cboThemePreset->getWidth() + DISTANCE_NEXT_X;
category.panel->add(cmdThemeSave, pos_x, pos_y);
pos_x += cmdThemeSave->getWidth() + DISTANCE_NEXT_X;
category.panel->add(cmdThemeSaveAs, pos_x, pos_y);
pos_y += cboThemePreset->getHeight() + DISTANCE_NEXT_Y;
pos_x = DISTANCE_BORDER;
category.panel->add(lblThemeFont, pos_x, pos_y);
pos_x = cboThemePreset->getX();
category.panel->add(txtThemeFont, pos_x, pos_y);
pos_x += txtThemeFont->getWidth() + 8;
category.panel->add(cmdThemeFont, pos_x, pos_y);
pos_x += cmdThemeFont->getWidth() + DISTANCE_NEXT_X;
category.panel->add(lblThemeFontSize, pos_x, pos_y);
pos_x += lblThemeFontSize->getWidth() + 8;
category.panel->add(txtThemeFontSize, pos_x, pos_y);
pos_y += txtThemeFont->getHeight() + DISTANCE_NEXT_Y / 2;
pos_x = DISTANCE_BORDER;
category.panel->add(themeFontColor.group, pos_x, pos_y);
pos_x = themeFontColor.group->getX() + themeFontColor.group->getWidth() + DISTANCE_NEXT_X;
category.panel->add(themeBaseColor.group, pos_x, pos_y);
pos_y += themeFontColor.group->getHeight() + DISTANCE_NEXT_Y / 2;
category.panel->add(themeSelectorInactiveColor.group, DISTANCE_BORDER, pos_y);
pos_x = themeSelectorInactiveColor.group->getX() + themeSelectorInactiveColor.group->getWidth() + DISTANCE_NEXT_X;
category.panel->add(themeSelectorActiveColor.group, pos_x, pos_y);
pos_y += themeSelectorInactiveColor.group->getHeight() + DISTANCE_NEXT_Y / 2;
category.panel->add(themeSelectionColor.group, DISTANCE_BORDER, pos_y);
pos_x = themeSelectionColor.group->getX() + themeSelectionColor.group->getWidth() + DISTANCE_NEXT_X;
category.panel->add(themeTextBgColor.group, pos_x, pos_y);
pos_y += themeSelectionColor.group->getHeight() + DISTANCE_NEXT_Y / 2;
category.panel->add(themeFgColor.group, DISTANCE_BORDER, pos_y);
// Bottom buttons
pos_x = DISTANCE_BORDER;
pos_y = category.panel->getHeight() - DISTANCE_BORDER - BUTTON_HEIGHT;
category.panel->add(cmdThemeUse, pos_x, pos_y);
pos_x += cmdThemeUse->getWidth() + DISTANCE_NEXT_X;
category.panel->add(cmdThemeReset, pos_x, pos_y);
}
void InitPanelThemes(const config_category& category)
{
themesActionListener = new ThemesActionListener();
lblThemePreset = new gcn::Label("Theme:");
cboThemePreset = CreateDropDown("cboThemePreset");
lblThemeFont = new gcn::Label("Font:");
txtThemeFont = new gcn::TextField();
txtThemeFont->setSize(380, TEXTFIELD_HEIGHT);
txtThemeFont->setBaseColor(gui_base_color);
txtThemeFont->setBackgroundColor(gui_background_color);
txtThemeFont->setForegroundColor(gui_foreground_color);
cmdThemeFont = new gcn::Button("...");
cmdThemeFont->setId("cmdThemeFont");
cmdThemeFont->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
cmdThemeFont->setBaseColor(gui_base_color);
cmdThemeFont->setForegroundColor(gui_foreground_color);
cmdThemeFont->addActionListener(themesActionListener);
lblThemeFontSize = new gcn::Label("Size:");
txtThemeFontSize = new gcn::TextField();
txtThemeFontSize->setSize(50, TEXTFIELD_HEIGHT);
txtThemeFontSize->setId("txtThemeFontSize");
txtThemeFontSize->setBaseColor(gui_base_color);
txtThemeFontSize->setBackgroundColor(gui_background_color);
txtThemeFontSize->setForegroundColor(gui_foreground_color);
InitRGBColorComponents(themeFontColor, "Font color");
InitRGBColorComponents(themeBaseColor, "Base color");
InitRGBColorComponents(themeSelectorInactiveColor, "Selector inactive color");
InitRGBColorComponents(themeSelectorActiveColor, "Selector active color");
InitRGBColorComponents(themeSelectionColor, "Selection color");
InitRGBColorComponents(themeTextBgColor, "Background color");
InitRGBColorComponents(themeFgColor, "Foreground color");
cmdThemeSave = CreateSmallButton("Save", "cmdThemeSave");
cmdThemeSaveAs = CreateSmallButton("Save as...", "cmdThemeSaveAs");
cmdThemeReset = CreateButton("Reset", "cmdThemeReset");
cmdThemeUse = CreateButton("Use", "cmdThemeUse");
PositionComponents(category);
RefreshPanelThemes();
}
void DeleteRGBColorComponents(const RGBColorComponents& components) {
delete components.group;
delete components.labelR;
delete components.sliderR;
delete components.valueR;
delete components.labelG;
delete components.sliderG;
delete components.valueG;
delete components.labelB;
delete components.sliderB;
delete components.valueB;
delete components.colorBox;
}
void ExitPanelThemes()
{
delete lblThemePreset;
delete cboThemePreset;
delete lblThemeFont;
delete txtThemeFont;
delete cmdThemeFont;
delete lblThemeFontSize;
delete txtThemeFontSize;
DeleteRGBColorComponents(themeFontColor);
DeleteRGBColorComponents(themeBaseColor);
DeleteRGBColorComponents(themeSelectorInactiveColor);
DeleteRGBColorComponents(themeSelectorActiveColor);
DeleteRGBColorComponents(themeSelectionColor);
DeleteRGBColorComponents(themeTextBgColor);
DeleteRGBColorComponents(themeFgColor);
delete cmdThemeSave;
delete cmdThemeSaveAs;
delete cmdThemeReset;
delete cmdThemeUse;
delete themesActionListener;
}
void RefreshRGBColorComponents(const RGBColorComponents& components, const gcn::Color& color) {
components.sliderR->setValue(color.r);
components.sliderG->setValue(color.g);
components.sliderB->setValue(color.b);
components.valueR->setCaption(std::to_string(color.r));
components.valueG->setCaption(std::to_string(color.g));
components.valueB->setCaption(std::to_string(color.b));
components.colorBox->setBaseColor(color);
}
void RefreshPanelThemes()
{
populate_themes_list();
// find selected theme in the list
int selected_theme = 0;
for (int i = 0; i < themes_list.getNumberOfElements(); i++)
{
if (themes_list.getElementAt(i) == amiberry_options.gui_theme)
{
selected_theme = i;
break;
}
}
cboThemePreset->setSelected(selected_theme);
txtThemeFont->setText(gui_theme.font_name);
txtThemeFontSize->setText(std::to_string(gui_theme.font_size));
RefreshRGBColorComponents(themeFontColor, gui_theme.font_color);
RefreshRGBColorComponents(themeBaseColor, gui_theme.base_color);
RefreshRGBColorComponents(themeSelectorInactiveColor, gui_theme.selector_inactive);
RefreshRGBColorComponents(themeSelectorActiveColor, gui_theme.selector_active);
RefreshRGBColorComponents(themeSelectionColor, gui_theme.selection_color);
RefreshRGBColorComponents(themeTextBgColor, gui_theme.background_color);
RefreshRGBColorComponents(themeFgColor, gui_theme.foreground_color);
}
bool HelpPanelThemes(std::vector<std::string>& helptext)
{
helptext.clear();
helptext.emplace_back("The themes panel allows you to customize the look of the GUI.");
helptext.emplace_back(" ");
helptext.emplace_back("The 'Theme' dropdown allows you to select a theme.");
helptext.emplace_back(" ");
helptext.emplace_back("Font: The font to use for the GUI.");
helptext.emplace_back("Font size: The size of the font.");
helptext.emplace_back("Font color: The color of the font.");
helptext.emplace_back("Base color: The base color of the GUI.");
helptext.emplace_back("Selector inactive color: The color of the inactive selector.");
helptext.emplace_back("Selector active color: The color of the active selector.");
helptext.emplace_back("Selection color: The color of the selection.");
helptext.emplace_back("Background color: The color of the background.");
helptext.emplace_back("Foreground color: The color of the foreground.");
helptext.emplace_back(" ");
helptext.emplace_back("The 'Save' button saves the current theme.");
helptext.emplace_back("The 'Save as...' button saves the current theme with a new name.");
helptext.emplace_back("The 'Reset' button resets the current theme to the default theme.");
helptext.emplace_back("The 'Use' button applies the current theme.");
helptext.emplace_back(" ");
return true;
}

16
src/osdep/gui/PanelVirtualKeyboard.cpp
View File

@ -223,7 +223,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
chkVkEnabled = new gcn::CheckBox(_T("Virtual Keyboard enabled"));
chkVkEnabled->setId("chkVkEnabled");
chkVkEnabled->setBaseColor(gui_base_color);
chkVkEnabled->setBackgroundColor(gui_textbox_background_color);
chkVkEnabled->setBackgroundColor(gui_background_color);
chkVkEnabled->setForegroundColor(gui_foreground_color);
chkVkEnabled->addActionListener(vkEnabledActionListener);
@ -231,7 +231,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
chkVkHires = new gcn::CheckBox(_T("High-Resolution"));
chkVkHires->setId("chkVkHires");
chkVkHires->setBaseColor(gui_base_color);
chkVkHires->setBackgroundColor(gui_textbox_background_color);
chkVkHires->setBackgroundColor(gui_background_color);
chkVkHires->setForegroundColor(gui_foreground_color);
chkVkHires->addActionListener(hiresChkActionListener);
@ -239,7 +239,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
chkVkExit = new gcn::CheckBox(_T("Quit button on keyboard"));
chkVkExit->setId("chkVkExit");
chkVkExit->setBaseColor(gui_base_color);
chkVkExit->setBackgroundColor(gui_textbox_background_color);
chkVkExit->setBackgroundColor(gui_background_color);
chkVkExit->setForegroundColor(gui_foreground_color);
chkVkExit->addActionListener(exitChkActionListener);
@ -249,7 +249,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
sldVkTransparency = new gcn::Slider(0, 100);
sldVkTransparency->setSize(100, SLIDER_HEIGHT);
sldVkTransparency->setBaseColor(gui_base_color);
sldVkTransparency->setBackgroundColor(gui_textbox_background_color);
sldVkTransparency->setBackgroundColor(gui_background_color);
sldVkTransparency->setForegroundColor(gui_foreground_color);
sldVkTransparency->setMarkerLength(20);
sldVkTransparency->setStepLength(1);
@ -265,7 +265,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
cboVkLanguage = new gcn::DropDown();
cboVkLanguage->setSize(120, cboVkLanguage->getHeight());
cboVkLanguage->setBaseColor(gui_base_color);
cboVkLanguage->setBackgroundColor(gui_textbox_background_color);
cboVkLanguage->setBackgroundColor(gui_background_color);
cboVkLanguage->setForegroundColor(gui_foreground_color);
cboVkLanguage->setSelectionColor(gui_selection_color);
cboVkLanguage->setId("cboVkLanguage");
@ -279,7 +279,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
cboVkStyle = new gcn::DropDown();
cboVkStyle->setSize(120, cboVkStyle->getHeight());
cboVkStyle->setBaseColor(gui_base_color);
cboVkStyle->setBackgroundColor(gui_textbox_background_color);
cboVkStyle->setBackgroundColor(gui_background_color);
cboVkStyle->setForegroundColor(gui_foreground_color);
cboVkStyle->setSelectionColor(gui_selection_color);
cboVkStyle->setId("cboVkStyle");
@ -294,7 +294,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
txtVkSetHotkey->setEnabled(false);
txtVkSetHotkey->setSize(120, TEXTFIELD_HEIGHT);
txtVkSetHotkey->setBaseColor(gui_base_color);
txtVkSetHotkey->setBackgroundColor(gui_textbox_background_color);
txtVkSetHotkey->setBackgroundColor(gui_background_color);
txtVkSetHotkey->setForegroundColor(gui_foreground_color);
cmdVkSetHotkey = new gcn::Button("...");
cmdVkSetHotkey->setId("cmdVkSetHotkey");
@ -312,7 +312,7 @@ void InitPanelVirtualKeyboard(const struct config_category& category)
chkRetroArchVkbd = new gcn::CheckBox("Use RetroArch Vkbd button");
chkRetroArchVkbd->setId("chkRetroArchVkbd");
chkRetroArchVkbd->setBaseColor(gui_base_color);
chkRetroArchVkbd->setBackgroundColor(gui_textbox_background_color);
chkRetroArchVkbd->setBackgroundColor(gui_background_color);
chkRetroArchVkbd->setForegroundColor(gui_foreground_color);
chkRetroArchVkbd->addActionListener(vkHotkeyActionListener);

26
src/osdep/gui/PanelWHDLoad.cpp
View File

@ -206,7 +206,7 @@ void InitPanelWHDLoad(const struct config_category& category)
cboWhdload = new gcn::DropDown(&whdloadFileList);
cboWhdload->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboWhdload->getHeight());
cboWhdload->setBaseColor(gui_base_color);
cboWhdload->setBackgroundColor(gui_textbox_background_color);
cboWhdload->setBackgroundColor(gui_background_color);
cboWhdload->setForegroundColor(gui_foreground_color);
cboWhdload->setSelectionColor(gui_selection_color);
cboWhdload->setId("cboWhdload");
@ -232,7 +232,7 @@ void InitPanelWHDLoad(const struct config_category& category)
txtGameName->setId("txtGameName");
txtGameName->setSize(textfield_width, TEXTFIELD_HEIGHT);
txtGameName->setBaseColor(gui_base_color);
txtGameName->setBackgroundColor(gui_textbox_background_color);
txtGameName->setBackgroundColor(gui_background_color);
txtGameName->setForegroundColor(gui_foreground_color);
txtGameName->setEnabled(false);
@ -241,7 +241,7 @@ void InitPanelWHDLoad(const struct config_category& category)
txtVariantUuid->setId("txtVariantUuid");
txtVariantUuid->setSize(textfield_width, TEXTFIELD_HEIGHT);
txtVariantUuid->setBaseColor(gui_base_color);
txtVariantUuid->setBackgroundColor(gui_textbox_background_color);
txtVariantUuid->setBackgroundColor(gui_background_color);
txtVariantUuid->setForegroundColor(gui_foreground_color);
txtVariantUuid->setEnabled(false);
@ -250,14 +250,14 @@ void InitPanelWHDLoad(const struct config_category& category)
txtSlaveDefault->setId("txtSlaveDefault");
txtSlaveDefault->setSize(textfield_width, TEXTFIELD_HEIGHT);
txtSlaveDefault->setBaseColor(gui_base_color);
txtSlaveDefault->setBackgroundColor(gui_textbox_background_color);
txtSlaveDefault->setBackgroundColor(gui_background_color);
txtSlaveDefault->setForegroundColor(gui_foreground_color);
txtSlaveDefault->setEnabled(false);
chkSlaveLibraries = new gcn::CheckBox("Slave Libraries");
chkSlaveLibraries->setId("chkSlaveLibraries");
chkSlaveLibraries->setBaseColor(gui_base_color);
chkSlaveLibraries->setBackgroundColor(gui_textbox_background_color);
chkSlaveLibraries->setBackgroundColor(gui_background_color);
chkSlaveLibraries->setForegroundColor(gui_foreground_color);
lblSlaves = new gcn::Label("Slaves:");
@ -265,7 +265,7 @@ void InitPanelWHDLoad(const struct config_category& category)
cboSlaves->setId("cboSlaves");
cboSlaves->setSize(textfield_width, cboSlaves->getHeight());
cboSlaves->setBaseColor(gui_base_color);
cboSlaves->setBackgroundColor(gui_textbox_background_color);
cboSlaves->setBackgroundColor(gui_background_color);
cboSlaves->setForegroundColor(gui_foreground_color);
cboSlaves->setSelectionColor(gui_selection_color);
cboSlaves->addActionListener(whdloadActionListener);
@ -275,7 +275,7 @@ void InitPanelWHDLoad(const struct config_category& category)
txtSlaveDataPath->setId("txtSlaveDataPath");
txtSlaveDataPath->setSize(textfield_width, TEXTFIELD_HEIGHT);
txtSlaveDataPath->setBaseColor(gui_base_color);
txtSlaveDataPath->setBackgroundColor(gui_textbox_background_color);
txtSlaveDataPath->setBackgroundColor(gui_background_color);
txtSlaveDataPath->setForegroundColor(gui_foreground_color);
txtSlaveDataPath->setEnabled(false);
@ -291,19 +291,19 @@ void InitPanelWHDLoad(const struct config_category& category)
txtCustomText->setId("txtCustomText");
txtCustomText->setSize(textfield_width, TEXTFIELD_HEIGHT);
txtCustomText->setBaseColor(gui_base_color);
txtCustomText->setBackgroundColor(gui_textbox_background_color);
txtCustomText->setBackgroundColor(gui_background_color);
txtCustomText->setForegroundColor(gui_foreground_color);
chkButtonWait = new gcn::CheckBox("Button Wait");
chkButtonWait->setId("chkButtonWait");
chkButtonWait->setBaseColor(gui_base_color);
chkButtonWait->setBackgroundColor(gui_textbox_background_color);
chkButtonWait->setBackgroundColor(gui_background_color);
chkButtonWait->setForegroundColor(gui_foreground_color);
chkButtonWait->addActionListener(whdloadActionListener);
chkShowSplash = new gcn::CheckBox("Show Splash");
chkShowSplash->setId("chkShowSplash");
chkShowSplash->setBaseColor(gui_base_color);
chkShowSplash->setBackgroundColor(gui_textbox_background_color);
chkShowSplash->setBackgroundColor(gui_background_color);
chkShowSplash->setForegroundColor(gui_foreground_color);
chkShowSplash->addActionListener(whdloadActionListener);
@ -312,19 +312,19 @@ void InitPanelWHDLoad(const struct config_category& category)
txtConfigDelay->setId("txtConfigDelay");
txtConfigDelay->setSize(textfield_width, TEXTFIELD_HEIGHT);
txtConfigDelay->setBaseColor(gui_base_color);
txtConfigDelay->setBackgroundColor(gui_textbox_background_color);
txtConfigDelay->setBackgroundColor(gui_background_color);
txtConfigDelay->setForegroundColor(gui_foreground_color);
chkWriteCache = new gcn::CheckBox("Write Cache");
chkWriteCache->setId("chkWriteCache");
chkWriteCache->setBaseColor(gui_base_color);
chkWriteCache->setBackgroundColor(gui_textbox_background_color);
chkWriteCache->setBackgroundColor(gui_background_color);
chkWriteCache->setForegroundColor(gui_foreground_color);
chkWriteCache->addActionListener(whdloadActionListener);
chkQuitOnExit = new gcn::CheckBox("Quit on Exit");
chkQuitOnExit->setId("chkQuitOnExit");
chkQuitOnExit->setBaseColor(gui_base_color);
chkQuitOnExit->setBackgroundColor(gui_textbox_background_color);
chkQuitOnExit->setBackgroundColor(gui_background_color);
chkQuitOnExit->setForegroundColor(gui_foreground_color);
chkQuitOnExit->addActionListener(whdloadActionListener);

12
src/osdep/gui/SelectFile.cpp
View File

@ -118,7 +118,7 @@ static void checkfoldername(const std::string& current)
txtCurrent->setText(workingDir);
}
static void checkfilename(std::string current)
static void checkfilename(const std::string& current)
{
char actfile[MAX_DPATH];
extract_filename(current.c_str(), actfile);
@ -145,7 +145,7 @@ public:
{
if (txtFilename->getText().empty())
return;
std::string tmp = workingDir + "/" + fileList->getElementAt(selected_item);
std::string tmp = workingDir + "/" + txtFilename->getText();
if (filefilter != nullptr) {
if (tmp.find(filefilter[0]) == std::string::npos)
@ -242,7 +242,7 @@ static void InitSelectFile(const std::string& title)
txtCurrent->setSize(DIALOG_WIDTH - 2 * DISTANCE_BORDER - 4, TEXTFIELD_HEIGHT);
txtCurrent->setPosition(DISTANCE_BORDER, 10);
txtCurrent->setBaseColor(gui_base_color);
txtCurrent->setBackgroundColor(gui_textbox_background_color);
txtCurrent->setBackgroundColor(gui_background_color);
txtCurrent->setForegroundColor(gui_foreground_color);
txtCurrent->setEnabled(true);
editFilePathActionListener = new EditFilePathActionListener();
@ -254,7 +254,7 @@ static void InitSelectFile(const std::string& title)
lstFiles = new gcn::ListBox(fileList);
lstFiles->setSize(DIALOG_WIDTH - 45, DIALOG_HEIGHT - 108);
lstFiles->setBaseColor(gui_base_color);
lstFiles->setBackgroundColor(gui_textbox_background_color);
lstFiles->setBackgroundColor(gui_background_color);
lstFiles->setForegroundColor(gui_foreground_color);
lstFiles->setSelectionColor(gui_selection_color);
lstFiles->setWrappingEnabled(true);
@ -266,7 +266,7 @@ static void InitSelectFile(const std::string& title)
scrAreaFiles->setSize(DIALOG_WIDTH - 2 * DISTANCE_BORDER - 4, DIALOG_HEIGHT - 128);
scrAreaFiles->setScrollbarWidth(SCROLLBAR_WIDTH);
scrAreaFiles->setBaseColor(gui_base_color);
scrAreaFiles->setBackgroundColor(gui_textbox_background_color);
scrAreaFiles->setBackgroundColor(gui_background_color);
scrAreaFiles->setForegroundColor(gui_foreground_color);
scrAreaFiles->setSelectionColor(gui_selection_color);
scrAreaFiles->setHorizontalScrollPolicy(gcn::ScrollArea::ShowAuto);
@ -283,7 +283,7 @@ static void InitSelectFile(const std::string& title)
txtFilename->setSize(350, TEXTFIELD_HEIGHT);
txtFilename->setId("Filename");
txtFilename->setBaseColor(gui_base_color);
txtFilename->setBackgroundColor(gui_textbox_background_color);
txtFilename->setBackgroundColor(gui_background_color);
txtFilename->setForegroundColor(gui_foreground_color);
txtFilename->setPosition(lblFilename->getX() + lblFilename->getWidth() + DISTANCE_NEXT_X, lblFilename->getY());

6
src/osdep/gui/SelectFolder.cpp
View File

@ -195,7 +195,7 @@ static void InitSelectFolder(const std::string& title)
txtCurrent->setSize(DIALOG_WIDTH - 2 * DISTANCE_BORDER - 4, TEXTFIELD_HEIGHT);
txtCurrent->setPosition(DISTANCE_BORDER, 10);
txtCurrent->setBaseColor(gui_base_color);
txtCurrent->setBackgroundColor(gui_textbox_background_color);
txtCurrent->setBackgroundColor(gui_background_color);
txtCurrent->setForegroundColor(gui_foreground_color);
txtCurrent->setEnabled(true);
editDirPathActionListener = new EditDirPathActionListener();
@ -206,7 +206,7 @@ static void InitSelectFolder(const std::string& title)
lstFolders = new gcn::ListBox(&dirList);
lstFolders->setSize(DIALOG_WIDTH - 45, DIALOG_HEIGHT - 108);
lstFolders->setBaseColor(gui_base_color);
lstFolders->setBackgroundColor(gui_textbox_background_color);
lstFolders->setBackgroundColor(gui_background_color);
lstFolders->setForegroundColor(gui_foreground_color);
lstFolders->setSelectionColor(gui_selection_color);
lstFolders->setWrappingEnabled(true);
@ -218,7 +218,7 @@ static void InitSelectFolder(const std::string& title)
scrAreaFolders->setSize(DIALOG_WIDTH - 2 * DISTANCE_BORDER - 4, DIALOG_HEIGHT - 128);
scrAreaFolders->setScrollbarWidth(SCROLLBAR_WIDTH);
scrAreaFolders->setBaseColor(gui_base_color);
scrAreaFolders->setBackgroundColor(gui_textbox_background_color);
scrAreaFolders->setBackgroundColor(gui_background_color);
scrAreaFolders->setForegroundColor(gui_foreground_color);
scrAreaFolders->setSelectionColor(gui_selection_color);
scrAreaFolders->setHorizontalScrollPolicy(gcn::ScrollArea::ShowAuto);

4
src/osdep/gui/SelectorEntry.cpp
View File

@ -45,14 +45,14 @@ namespace gcn
graphics->drawRectangle(Rectangle(2, 2, getWidth() - 4, getHeight() - 4));
}
void SelectorEntry::setInactiveColor(const Color& color)
void SelectorEntry::setInactiveColor(Color color)
{
inactiveColor = color;
if (!active)
container->setBaseColor(color);
}
void SelectorEntry::setActiveColor(const Color& color)
void SelectorEntry::setActiveColor(Color color)
{
activeColor = color;
if (active)

4
src/osdep/gui/SelectorEntry.hpp
View File

@ -27,8 +27,8 @@ namespace gcn
void draw(Graphics* graphics) override;
void setInactiveColor(const Color& color);
void setActiveColor(const Color& color);
void setInactiveColor(Color color);
void setActiveColor(Color color);
void setActive(bool active);
bool getActive() const;

6
src/osdep/gui/ShowCustomFields.cpp
View File

@ -126,7 +126,7 @@ void create_custom_field(custom_widget& widget, const int number, const std::str
checkbox->setId("chkCustomFieldBit_" + std::to_string(i));
checkbox->setForegroundColor(gui_foreground_color);
checkbox->setBaseColor(gui_base_color);
checkbox->setBackgroundColor(gui_textbox_background_color);
checkbox->setBackgroundColor(gui_background_color);
checkbox->setPosition(pos_x2, pos_y);
widget.bit.emplace_back(checkbox);
wndShowCustomFields->add(checkbox);
@ -140,7 +140,7 @@ void create_custom_field(custom_widget& widget, const int number, const std::str
checkbox->setId("chkCustomFieldBool_" + std::to_string(i));
checkbox->setForegroundColor(gui_foreground_color);
checkbox->setBaseColor(gui_base_color);
checkbox->setBackgroundColor(gui_textbox_background_color);
checkbox->setBackgroundColor(gui_background_color);
checkbox->setPosition(pos_x2, pos_y);
widget.boolean.emplace_back(checkbox);
wndShowCustomFields->add(checkbox);
@ -158,7 +158,7 @@ void create_custom_field(custom_widget& widget, const int number, const std::str
dropdown->setId("cboCustomFieldList_" + std::to_string(i));
dropdown->setSize(textfield_width, dropdown->getHeight());
dropdown->setBaseColor(gui_base_color);
dropdown->setBackgroundColor(gui_textbox_background_color);
dropdown->setBackgroundColor(gui_background_color);
dropdown->setForegroundColor(gui_foreground_color);
dropdown->setSelectionColor(gui_selection_color);
dropdown->addActionListener(showCustomFieldsActionListener);

4
src/osdep/gui/ShowDiskInfo.cpp
View File

@ -61,7 +61,7 @@ static void InitShowDiskInfo(const std::vector<std::string>& infotext)
DIALOG_HEIGHT - 3 * DISTANCE_BORDER - BUTTON_HEIGHT - DISTANCE_NEXT_Y - 10);
lstInfo->setPosition(DISTANCE_BORDER, DISTANCE_BORDER);
lstInfo->setBaseColor(gui_base_color);
lstInfo->setBackgroundColor(gui_textbox_background_color);
lstInfo->setBackgroundColor(gui_background_color);
lstInfo->setForegroundColor(gui_foreground_color);
lstInfo->setSelectionColor(gui_selection_color);
lstInfo->setWrappingEnabled(true);
@ -73,7 +73,7 @@ static void InitShowDiskInfo(const std::vector<std::string>& infotext)
DIALOG_HEIGHT - 3 * DISTANCE_BORDER - BUTTON_HEIGHT - DISTANCE_NEXT_Y - 10);
scrAreaInfo->setScrollbarWidth(SCROLLBAR_WIDTH);
scrAreaInfo->setBaseColor(gui_base_color);
scrAreaInfo->setBackgroundColor(gui_textbox_background_color);
scrAreaInfo->setBackgroundColor(gui_background_color);
scrAreaInfo->setForegroundColor(gui_foreground_color);
scrAreaInfo->setSelectionColor(gui_selection_color);

15
src/osdep/gui/gui_handling.h
View File

@ -168,6 +168,8 @@ using ConfigCategory = struct config_category
};
extern bool gui_running;
extern gcn::Container* selectors;
extern gcn::ScrollArea* selectorsScrollArea;
extern ConfigCategory categories[];
extern gcn::Gui* uae_gui;
extern gcn::Container* gui_top;
@ -175,7 +177,7 @@ extern gcn::Container* gui_top;
// GUI Colors
extern amiberry_gui_theme gui_theme;
extern gcn::Color gui_base_color;
extern gcn::Color gui_textbox_background_color;
extern gcn::Color gui_background_color;
extern gcn::Color gui_selector_inactive_color;
extern gcn::Color gui_selector_active_color;
extern gcn::Color gui_selection_color;
@ -326,6 +328,11 @@ void ExitPanelWHDLoad();
void RefreshPanelWHDLoad();
bool HelpPanelWHDLoad(std::vector<std::string>& helptext);
void InitPanelThemes(const struct config_category& category);
void ExitPanelThemes();
void RefreshPanelThemes();
bool HelpPanelThemes(std::vector<std::string>& helptext);
void refresh_all_panels();
void focus_bug_workaround(gcn::Window* wnd);
void disable_resume();
@ -421,6 +428,12 @@ extern void save_mapping_to_file(const std::string& mapping);
extern void clear_whdload_prefs();
extern void create_startup_sequence();
extern std::vector<int> parse_color_string(const std::string& input);
extern void save_theme(const std::string& theme_filename);
extern void load_theme(const std::string& theme_filename);
extern void load_default_theme();
extern void apply_theme();
extern void SetLastActiveConfig(const char* filename);
#endif // GUI_HANDLING_H

76
src/osdep/gui/main_window.cpp
View File

@ -96,6 +96,8 @@ ConfigCategory categories[] = {
},
{"WHDLoad", "drive.ico", nullptr, nullptr, InitPanelWHDLoad, ExitPanelWHDLoad, RefreshPanelWHDLoad, HelpPanelWHDLoad},
{"Themes", "amigainfo.ico", nullptr, nullptr, InitPanelThemes, ExitPanelThemes, RefreshPanelThemes, HelpPanelThemes},
{nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}
};
@ -153,7 +155,7 @@ gcn::ScrollArea* selectorsScrollArea;
// GUI Colors
gcn::Color gui_base_color;
gcn::Color gui_textbox_background_color;
gcn::Color gui_background_color;
gcn::Color gui_selector_inactive_color;
gcn::Color gui_selector_active_color;
gcn::Color gui_selection_color;
@ -395,17 +397,12 @@ void amiberry_gui_init()
// Note, any surface will do, it doesn't have to be the screen.
gui_graphics->setTarget(gui_screen);
gui_input = new gcn::SDLInput();
uae_gui = new gcn::Gui();
uae_gui->setGraphics(gui_graphics);
uae_gui->setInput(gui_input);
}
void amiberry_gui_halt()
{
AmigaMonitor* mon = &AMonitors[0];
delete uae_gui;
uae_gui = nullptr;
delete gui_imageLoader;
gui_imageLoader = nullptr;
delete gui_input;
@ -1002,15 +999,19 @@ void gui_widgets_init()
int yPos;
//-------------------------------------------------
// Define base colors
// Create GUI
//-------------------------------------------------
gui_base_color = gui_theme.base_color;
gui_selector_inactive_color = gui_theme.selector_inactive;
gui_selector_active_color = gui_theme.selector_active;
gui_textbox_background_color = gui_theme.textbox_background;
gui_selection_color = gui_theme.selection_color;
gui_foreground_color = gui_theme.foreground_color;
gui_font_color = gui_theme.font_color;
uae_gui = new gcn::Gui();
uae_gui->setGraphics(gui_graphics);
uae_gui->setInput(gui_input);
//-------------------------------------------------
// Initialize fonts
//-------------------------------------------------
TTF_Init();
load_theme(amiberry_options.gui_theme);
apply_theme();
//-------------------------------------------------
// Create container for main page
@ -1022,45 +1023,6 @@ void gui_widgets_init()
gui_top->setForegroundColor(gui_foreground_color);
uae_gui->setTop(gui_top);
//-------------------------------------------------
// Initialize fonts
//-------------------------------------------------
TTF_Init();
try
{
// Check if the font_name contains the full path to the file (e.g. in /usr/share/fonts)
if (my_existsfile2(gui_theme.font_name.c_str()))
{
gui_font = new gcn::SDLTrueTypeFont(gui_theme.font_name, gui_theme.font_size);
}
else
{
// Try to open it from the data directory
std::string font = get_data_path();
font.append(gui_theme.font_name);
gui_font = new gcn::SDLTrueTypeFont(font, gui_theme.font_size);
}
gui_font->setAntiAlias(false);
gui_font->setColor(gui_font_color);
}
catch (gcn::Exception& e)
{
gui_running = false;
std::cout << e.getMessage() << '\n';
write_log("An error occurred while trying to open the GUI font! Exception: %s\n", e.getMessage().c_str());
abort();
}
catch (std::exception& ex)
{
gui_running = false;
cout << ex.what() << '\n';
write_log("An error occurred while trying to open the GUI font! Exception: %s\n", ex.what());
abort();
}
gcn::Widget::setGlobalFont(gui_font);
//--------------------------------------------------
// Create main buttons
//--------------------------------------------------
@ -1116,15 +1078,15 @@ void gui_widgets_init()
constexpr auto workAreaHeight = GUI_HEIGHT - 2 * DISTANCE_BORDER - BUTTON_HEIGHT - DISTANCE_NEXT_Y;
selectors = new gcn::Container();
selectors->setFrameSize(0);
selectors->setBaseColor(gui_selector_inactive_color);
selectors->setBaseColor(gui_base_color);
selectors->setBackgroundColor(gui_base_color);
selectors->setForegroundColor(gui_foreground_color);
constexpr auto selectorScrollAreaWidth = SELECTOR_WIDTH + 2;
selectorsScrollArea = new gcn::ScrollArea();
selectorsScrollArea->setContent(selectors);
selectorsScrollArea->setBaseColor(gui_selector_inactive_color);
selectorsScrollArea->setBackgroundColor(gui_selector_inactive_color);
selectorsScrollArea->setBaseColor(gui_base_color);
selectorsScrollArea->setBackgroundColor(gui_base_color);
selectorsScrollArea->setForegroundColor(gui_foreground_color);
selectorsScrollArea->setSize(selectorScrollAreaWidth, workAreaHeight);
selectorsScrollArea->setFrameSize(1);
@ -1224,6 +1186,8 @@ void gui_widgets_halt()
gui_font = nullptr;
delete gui_top;
gui_top = nullptr;
delete uae_gui;
uae_gui = nullptr;
}
void refresh_all_panels()

2
src/osdep/target.h
View File

@ -104,6 +104,7 @@ extern void set_nvram_path(const std::string& newpath);
extern void set_plugins_path(const std::string& newpath);
extern void set_screenshot_path(const std::string& newpath);
extern void set_savestate_path(const std::string& newpath);
extern void set_themes_path(const std::string& newpath);
extern std::string get_controllers_path();
extern void set_controllers_path(const std::string& newpath);
@ -121,6 +122,7 @@ extern std::string get_harddrive_path();
extern void set_harddrive_path(const std::string& newpath);
extern std::string get_cdrom_path();
extern void set_cdrom_path(const std::string& newpath);
extern std::string get_themes_path();
extern bool get_logfile_enabled();
extern void set_logfile_enabled(bool enabled);