chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Additional changes to 3d61328

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-12-13 12:20:14 +02:00
parent fdd350ef42
commit 3c72b7171c
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/DialogAbout.cpp
View File

@ -229,21 +229,21 @@ INT_PTR CDialogAbout::OnInitDialog(WPARAM wParam, LPARAM lParam)
{ {
static const ControlTemplate::Control s_Controls[] = static const ControlTemplate::Control s_Controls[] =
{ {
CT_TAB(Id_Tab, 0,
6, 6, 388, 181,
WS_VISIBLE | WS_TABSTOP | TCS_FIXEDWIDTH, WS_EX_CONTROLPARENT),
CT_BUTTON(Id_CloseButton, ID_STR_CLOSE, CT_BUTTON(Id_CloseButton, ID_STR_CLOSE,
344, 191, 50, 14, 344, 191, 50, 14,
WS_VISIBLE | WS_TABSTOP | BS_DEFPUSHBUTTON, 0) WS_VISIBLE | WS_TABSTOP | BS_DEFPUSHBUTTON, 0),
CT_TAB(Id_Tab, 0,
6, 6, 388, 181,
WS_VISIBLE | WS_TABSTOP | TCS_FIXEDWIDTH, 0) // Last for correct tab order.
}; };
CreateControls(s_Controls, _countof(s_Controls), m_Font, GetString); CreateControls(s_Controls, _countof(s_Controls), m_Font, GetString);
HWND item = GetControl(Id_Tab); HWND item = GetControl(Id_Tab);
m_TabLog.Create(item); m_TabLog.Create(m_Window);
m_TabSkins.Create(item); m_TabSkins.Create(m_Window);
m_TabPlugins.Create(item); m_TabPlugins.Create(m_Window);
m_TabVersion.Create(item); m_TabVersion.Create(m_Window);
TCITEM tci = {0}; TCITEM tci = {0};
tci.mask = TCIF_TEXT; tci.mask = TCIF_TEXT;
@ -340,7 +340,7 @@ CDialogAbout::CTabLog::CTabLog() : CTab(),
void CDialogAbout::CTabLog::Create(HWND owner) void CDialogAbout::CTabLog::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 370, 148, owner); CTab::CreateTabWindow(15, 30, 370, 148, owner);
static const ControlTemplate::Control s_Controls[] = static const ControlTemplate::Control s_Controls[] =
{ {
@ -614,7 +614,7 @@ CDialogAbout::CTabSkins::CTabSkins() : CTab(),
void CDialogAbout::CTabSkins::Create(HWND owner) void CDialogAbout::CTabSkins::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 370, 148, owner); CTab::CreateTabWindow(15, 30, 370, 148, owner);
static const ControlTemplate::Control s_Controls[] = static const ControlTemplate::Control s_Controls[] =
{ {
@ -961,7 +961,7 @@ CDialogAbout::CTabPlugins::CTabPlugins() : CTab()
void CDialogAbout::CTabPlugins::Create(HWND owner) void CDialogAbout::CTabPlugins::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 370, 148, owner); CTab::CreateTabWindow(15, 30, 370, 148, owner);
static const ControlTemplate::Control s_Controls[] = static const ControlTemplate::Control s_Controls[] =
{ {
@ -1149,7 +1149,7 @@ CDialogAbout::CTabVersion::CTabVersion() : CTab()
void CDialogAbout::CTabVersion::Create(HWND owner) void CDialogAbout::CTabVersion::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 370, 148, owner); CTab::CreateTabWindow(15, 30, 370, 148, owner);
// FIXME: Temporary hack. // FIXME: Temporary hack.
short buttonWidth = (short)_wtoi(GetString(ID_STR_NUM_BUTTONWIDTH)); short buttonWidth = (short)_wtoi(GetString(ID_STR_NUM_BUTTONWIDTH));

20
Library/DialogManage.cpp
View File

@ -188,9 +188,6 @@ INT_PTR CDialogManage::OnInitDialog(WPARAM wParam, LPARAM lParam)
const ControlTemplate::Control s_Controls[] = const ControlTemplate::Control s_Controls[] =
{ {
CT_TAB(Id_Tab, 0,
6, 6, 488, 293,
WS_VISIBLE | WS_TABSTOP | TCS_FIXEDWIDTH, WS_EX_CONTROLPARENT),
CT_BUTTON(Id_RefreshAllButton, ID_STR_REFRESHALL, CT_BUTTON(Id_RefreshAllButton, ID_STR_REFRESHALL,
5, 303, buttonWidth, 14, 5, 303, buttonWidth, 14,
WS_VISIBLE | WS_TABSTOP, 0), WS_VISIBLE | WS_TABSTOP, 0),
@ -205,15 +202,18 @@ INT_PTR CDialogManage::OnInitDialog(WPARAM wParam, LPARAM lParam)
WS_VISIBLE | WS_TABSTOP, 0), WS_VISIBLE | WS_TABSTOP, 0),
CT_BUTTON(Id_CloseButton, ID_STR_CLOSE, CT_BUTTON(Id_CloseButton, ID_STR_CLOSE,
444, 303, 50, 14, 444, 303, 50, 14,
WS_VISIBLE | WS_TABSTOP | BS_DEFPUSHBUTTON, 0) WS_VISIBLE | WS_TABSTOP | BS_DEFPUSHBUTTON, 0),
CT_TAB(Id_Tab, 0,
6, 6, 488, 293,
WS_VISIBLE | WS_TABSTOP | TCS_FIXEDWIDTH, 0) // Last for correct tab order.
}; };
CreateControls(s_Controls, _countof(s_Controls), m_Font, GetString); CreateControls(s_Controls, _countof(s_Controls), m_Font, GetString);
HWND item = GetControl(Id_Tab); HWND item = GetControl(Id_Tab);
m_TabSkins.Create(item); m_TabSkins.Create(m_Window);
m_TabLayouts.Create(item); m_TabLayouts.Create(m_Window);
m_TabSettings.Create(item); m_TabSettings.Create(m_Window);
TCITEM tci = {0}; TCITEM tci = {0};
tci.mask = TCIF_TEXT; tci.mask = TCIF_TEXT;
@ -344,7 +344,7 @@ CDialogManage::CTabSkins::CTabSkins() : CTab(),
void CDialogManage::CTabSkins::Create(HWND owner) void CDialogManage::CTabSkins::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 470, 260, owner); CTab::CreateTabWindow(15, 30, 470, 260, owner);
// FIXME: Temporary hack. // FIXME: Temporary hack.
short labelWidth = (short)_wtoi(GetString(ID_STR_NUM_LABELWIDTH)); short labelWidth = (short)_wtoi(GetString(ID_STR_NUM_LABELWIDTH));
@ -1494,7 +1494,7 @@ CDialogManage::CTabLayouts::CTabLayouts() : CTab()
void CDialogManage::CTabLayouts::Create(HWND owner) void CDialogManage::CTabLayouts::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 470, 260, owner); CTab::CreateTabWindow(15, 30, 470, 260, owner);
static const ControlTemplate::Control s_Controls[] = static const ControlTemplate::Control s_Controls[] =
{ {
@ -1796,7 +1796,7 @@ CDialogManage::CTabSettings::CTabSettings() : CTab()
void CDialogManage::CTabSettings::Create(HWND owner) void CDialogManage::CTabSettings::Create(HWND owner)
{ {
CTab::CreateTabWindow(9, 24, 470, 260, owner); CTab::CreateTabWindow(15, 30, 470, 260, owner);
// FIXME: Temporary hack. // FIXME: Temporary hack.
short buttonWidth = (short)_wtoi(GetString(ID_STR_NUM_BUTTONWIDTH)); short buttonWidth = (short)_wtoi(GetString(ID_STR_NUM_BUTTONWIDTH));