frankly speaking, neither colors not effects have flags

11 files changed, 4 insertions, 16 deletions

diff --git a/include/delphi/m_fontservice.inc b/include/delphi/m_fontservice.inc
index 1a906e596e..4599df07be 100644
--- a/include/delphi/m_fontservice.inc
+++ b/include/delphi/m_fontservice.inc
@@ -71,8 +71,8 @@ type
     name           : array[0..63] of AnsiChar;

     dbSettingsGroup: array[0..31] of AnsiChar;

     prefix         : array[0..31] of AnsiChar;

-    flags          : dword;

     deffontsettings: TFontSettings; // defaults, if flags & FIDF_DEFAULTVALID

+    flags          : dword;

     order          : int;

     backgroundGroup:array [0..63] of AnsiChar;

     backgroundName: array [0..63] of AnsiChar;

@@ -86,8 +86,8 @@ type
     name           : array[0..63] of WideChar;

     dbSettingsGroup: array[0..31] of AnsiChar;

     prefix         : array[0..31] of AnsiChar;

-    flags          : dword;

     deffontsettings: TFontSettingsW; // defaults, if flags & FIDF_DEFAULTVALID

+    flags          : dword;

     order          : int;

     backgroundGroup:array [0..63] of WideChar;

     backgroundName: array [0..63] of WideChar;

@@ -109,7 +109,6 @@ type
     name            : array[0..63] of AnsiChar;

     dbSettingsGroup : array[0..31] of AnsiChar;

     setting         : array[0..31] of AnsiChar;

-    flags           : dword;     // not used

     defcolour       : TCOLORREF; // default value

     order           : int;

   end;

@@ -122,7 +121,6 @@ type
     name            : array[0..63] of WideChar;

     dbSettingsGroup : array[0..31] of AnsiChar;

     setting         : array[0..31] of AnsiChar;

-    flags           : dword;     // not used

     defcolour       : TCOLORREF; // default value

     order           : int;

   end;

diff --git a/include/m_fontservice.h b/include/m_fontservice.h
index 3bda3038f1..61ac81df28 100644
--- a/include/m_fontservice.h
+++ b/include/m_fontservice.h
@@ -15,7 +15,6 @@ struct MBaseFontObject
 	char     name[64];	// [TRANSLATED-BY-CORE]

 	char     dbSettingsGroup[32];

 	char     setting[32];

-	DWORD    flags;

 };

 

 struct MBaseFontObjectW

@@ -24,7 +23,6 @@ struct MBaseFontObjectW
 	wchar_t    name[64];

 	char       dbSettingsGroup[32];

 	char       setting[32];

-	DWORD      flags;

 };

 

 //////////////////////////////////////////////////////////////////////////

@@ -87,6 +85,7 @@ struct FontSettingsW
 struct FontID : public MBaseFontObject

 {

 	FontSettings deffontsettings;  // defaults, valid if flags & FIDF_DEFAULTVALID

+	DWORD flags;                   // FIDF_* combination

 	int   order;                   // controls the order in the font group in which the fonts are listed in the UI (if order fields are equal,

 											 // they will be ordered alphabetically by name)

 	char  backgroundGroup[64];

@@ -96,6 +95,7 @@ struct FontID : public MBaseFontObject
 struct FontIDW : public MBaseFontObjectW

 {

 	FontSettingsW deffontsettings; // defaults, valid if flags & FIDF_DEFAULTVALID

+	DWORD   flags;                 // FIDF_* combination

 	int     order;                 // controls the order in the font group in which the fonts are listed in the UI (if order fields are equal,

 											 // they will be ordered alphabetically by name)

 	wchar_t backgroundGroup[64];

diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp
index fc4813f962..047a84e04c 100644
--- a/plugins/Alarms/src/alarm_win.cpp
+++ b/plugins/Alarms/src/alarm_win.cpp
@@ -372,7 +372,6 @@ int AlarmWinModulesLoaded(WPARAM, LPARAM)
 	wcsncpy_s(bk_colour_id.name, LPGENW("Background"), _TRUNCATE);

 	strncpy_s(bk_colour_id.setting, "BkColour", _TRUNCATE);

 	bk_colour_id.defcolour = GetSysColor(COLOR_3DFACE);

-	bk_colour_id.flags = 0;

 	bk_colour_id.order = 0;

 

 	g_plugin.addColor(&bk_colour_id);

diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp
index e064c1b27d..1f2c440afe 100755
--- a/plugins/Alarms/src/frame.cpp
+++ b/plugins/Alarms/src/frame.cpp
@@ -567,7 +567,6 @@ int CreateFrame()
 	strncpy_s(framebk_colour_id.name, LPGEN("Alarm reminders"), _TRUNCATE);

 	strncpy_s(framebk_colour_id.setting, "clFrameBack", _TRUNCATE);

 	framebk_colour_id.defcolour = GetSysColor(COLOR_3DFACE);

-	framebk_colour_id.flags = 0;

 	framebk_colour_id.order = 0;

 	g_plugin.addColor(&framebk_colour_id);

 

diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 2e9f896030..3aa14ff5af 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -166,7 +166,6 @@ void RegisterFontServiceFonts()
 	ColourID colorid = {};

 	strncpy_s(colorid.group, SECTIONNAME, _TRUNCATE);

 	strncpy_s(colorid.dbSettingsGroup, MODULENAME, _TRUNCATE);

-	colorid.flags = 0;

 

 	for (int i = 0; i < _countof(colourOptionsList); i++) {

 		colorid.order = i;

diff --git a/plugins/QuickSearch/i_ok.inc b/plugins/QuickSearch/i_ok.inc
index 49a0729a9c..a861c02938 100644
--- a/plugins/QuickSearch/i_ok.inc
+++ b/plugins/QuickSearch/i_ok.inc
@@ -44,7 +44,6 @@ var
   cid:TColourID;

   i:tqscolor;

 begin

-  cid.flags :=0;

   StrCopy(cid.group,qs_module);

   StrCopy(cid.dbSettingsGroup,qs_module);

 

diff --git a/plugins/QuickSearch/sr_frame.pas b/plugins/QuickSearch/sr_frame.pas
index 1aba1c850a..e3979c5d9e 100644
--- a/plugins/QuickSearch/sr_frame.pas
+++ b/plugins/QuickSearch/sr_frame.pas
@@ -180,7 +180,6 @@ begin
       tmp:=SendMessage(wnd,CLM_GETEXSTYLE,0,0);

       SendMessage(wnd,CLM_SETEXSTYLE,tmp or CLS_EX_SHOWSELALWAYS,0);

 

-      cid.flags :=0;

       StrCopy(cid.group,'QuickSearch');

       StrCopy(cid.dbSettingsGroup,qs_module);

 

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index ee98aabe7a..b056b8bf27 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -105,7 +105,6 @@ void RegisterFontServiceFonts()
 	ColourIDW cid = {};

 	wcsncpy_s(cid.group, LPGENW("Messaging"), _TRUNCATE);

 	strncpy(cid.dbSettingsGroup, SRMM_MODULE, _countof(fid.dbSettingsGroup));

-	cid.flags = 0;

 	for (int i = 0; i < _countof(colourOptionsList); i++) {

 		cid.order = i;

 		wcsncpy(cid.name, colourOptionsList[i].szName, _countof(cid.name));

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 1e9177063f..1a4ef3b14d 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -86,7 +86,6 @@ void CTooltipNotify::RegisterFonts()
 	ColourIDW colorId = {};

 	wcsncpy(colorId.group, FONTSERV_GROUP, _countof(colorId.group) - 1);

 	strncpy(colorId.dbSettingsGroup, MODULENAME, _countof(colorId.dbSettingsGroup) - 1);

-	colorId.flags = 0;

 	colorId.defcolour = DEF_SETTING_BGCOLOR;

 	colorId.order = 0;

 

diff --git a/plugins/mRadio/rframeapi.pas b/plugins/mRadio/rframeapi.pas
index 81443dd843..2d300a9e62 100644
--- a/plugins/mRadio/rframeapi.pas
+++ b/plugins/mRadio/rframeapi.pas
@@ -236,7 +236,6 @@ begin
       tmp:=SendMessage(wnd,CLM_GETEXSTYLE,0,0);

       SendMessage(wnd,CLM_SETEXSTYLE,tmp or CLS_EX_SHOWSELALWAYS,0);

 

-      cid.flags :=0;

       StrCopy(cid.group,cPluginName);

       StrCopy(cid.dbSettingsGroup,cPluginName);

 

diff --git a/src/mir_app/src/FontService.cpp b/src/mir_app/src/FontService.cpp
index 720d43c83a..7f34b115b8 100644
--- a/src/mir_app/src/FontService.cpp
+++ b/src/mir_app/src/FontService.cpp
@@ -63,7 +63,6 @@ bool ConvertColourID(ColourID *cid, ColourIDW *cidw)
 {

 	strncpy_s(cidw->dbSettingsGroup, cid->dbSettingsGroup, _TRUNCATE);

 	strncpy_s(cidw->setting, cid->setting, _TRUNCATE);

-	cidw->flags = cid->flags;

 	cidw->defcolour = cid->defcolour;

 	cidw->order = cid->order;

 

@@ -76,7 +75,6 @@ bool ConvertEffectID(EffectID *eid, EffectIDW *eidw)
 {

 	strncpy_s(eidw->dbSettingsGroup, eid->dbSettingsGroup, _TRUNCATE);

 	strncpy_s(eidw->setting, eid->setting, _TRUNCATE);

-	eidw->flags = eid->flags;

 	eidw->defeffect.effectIndex = eid->defeffect.effectIndex;

 	eidw->defeffect.baseColour = eid->defeffect.baseColour;

 	eidw->defeffect.secondaryColour = eid->defeffect.secondaryColour;