aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/deftheme/CMakeLists.txt2
-rw-r--r--data/deftheme/MinimalDark-1.0.0/CMakeLists.txt16
-rw-r--r--data/deftheme/MinimalDark-1.0.0/themedata.kvc290
-rw-r--r--data/deftheme/MinimalDark-1.0.0/themeinfo.kvc9
-rw-r--r--data/pics/kvi_setup_theme_hires.pngbin66730 -> 33595 bytes
-rw-r--r--data/pics/kvi_setup_theme_lowres.pngbin29163 -> 15252 bytes
-rw-r--r--src/modules/setup/libkvisetup.cpp19
-rw-r--r--src/modules/setup/setupwizard.cpp56
-rw-r--r--src/modules/setup/setupwizard.h9
9 files changed, 356 insertions, 45 deletions
diff --git a/data/deftheme/CMakeLists.txt b/data/deftheme/CMakeLists.txt
index a5c1d0956..7981ef659 100644
--- a/data/deftheme/CMakeLists.txt
+++ b/data/deftheme/CMakeLists.txt
@@ -1,5 +1,5 @@
# CMakeLists for data/deftheme
# Find subdirs
-SUBDIRS(YellowIRC-1.0.0)
+SUBDIRS(MinimalDark-1.0.0 YellowIRC-1.0.0)
diff --git a/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt b/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt
new file mode 100644
index 000000000..41c4dc74b
--- /dev/null
+++ b/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt
@@ -0,0 +1,16 @@
+# CMakeLists for data/deftheme/MinimalDark-1.0.0
+
+FILE(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+FILE(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc")
+LIST(APPEND files ${images} ${themefiles})
+
+IF(UNIX)
+ IF(APPLE)
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/MinimalDark-1.0.0/)
+ ELSE()
+ # Assume linux
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/MinimalDark-1.0.0/)
+ ENDIF()
+ELSEIF(WIN32)
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/MinimalDark-1.0.0/)
+ENDIF()
diff --git a/data/deftheme/MinimalDark-1.0.0/themedata.kvc b/data/deftheme/MinimalDark-1.0.0/themedata.kvc
new file mode 100644
index 000000000..4b8d6393d
--- /dev/null
+++ b/data/deftheme/MinimalDark-1.0.0/themedata.kvc
@@ -0,0 +1,290 @@
+# KVIrc configuration file
+[ThemeData]
+boolShowAvatarsInUserlist=true
+boolShowUserListStatisticLabel=true
+fontWindowList=Courier%2010%20Pitch,10,0,50
+msgtypeLink=0,2,100,1,0
+msgtypeServerPing=36,15,100,1,0
+msgtypeUnban=68,5,100,1,1
+msgtypeHalfOp=174,3,100,1,1
+msgtypeIdent=171,2,100,1,3
+msgtypeQueryTrace=181,15,100,1,1
+msgtypeWallops=139,5,100,1,3
+msgtypeMeDeOp=191,3,100,1,5
+msgtypeMeBan=195,5,100,1,5
+mirccolor2=0,0,140
+mirccolor14=80,80,80
+iccolor4=255,255,255
+boolBoldedNicks=false
+stringExtendedPrivmsgPrefix=[
+colorGlobalTransparencyFade=255,255,255
+colorTreeWindowListActiveBackground=200,200,200
+uintUserListPixmapAlign=1
+uintToolBarAppletPixmapAlign=0
+msgtypeChannelPrivateMessage=46,0,100,1,3
+msgtypeCtcpRequestReplied=52,5,100,1,2
+msgtypeKey=65,15,100,1,2
+msgtypeBroadcastPrivmsg=183,0,100,1,3
+mirccolor3=0,100,0
+mirccolor15=170,170,170
+iccolor5=0,150,190
+boolScaleAvatars=true
+colorUserListViewOwnForeground=126,74,131
+colorInputControl=200,100,0
+colorTreeWindowListHighlight1Foreground=0,16,144
+uintUserListViewGridType=3
+uintTimeStampBackground=100
+uintUserIrcViewOwnForeground=4
+msgtypeEcho=0,0,100,1,1
+msgtypeHostLookup=13,2,100,1,1
+msgtypeSystemError=24,4,100,1,4
+msgtypeRaw=25,2,100,1,1
+msgtypeSystemWarning=26,4,100,1,3
+msgtypeSystemMessage=27,2,100,1,1
+msgtypeUnhandledReply=28,2,100,1,1
+msgtypeJoin=39,14,100,1,2
+msgtypeVoice=35,3,100,1,1
+msgtypeMeInviteUnexcept=200,3,100,1,5
+msgtypeUserOp=174,3,100,1,1
+mirccolor4=230,0,0
+iccolor6=0,130,0
+pixmapMdiBackground=
+pixmapUserListViewBackground=
+boolUseCompositingForTransparency=false
+colorLabelBackground=0,0,0
+colorIrcToolBarAppletBackground=0,0,0
+colorIrcToolBarAppletForegroundHighContrastActive1=255,255,255
+colorTreeWindowListHighlight2Foreground=32,0,255
+msgtypeOwnPrivateMessage=45,0,1,1,3
+msgtypeBanUnexcept=70,15,100,1,1
+msgtypeSpam=120,14,100,1,3
+msgtypeChanServ=165,5,100,1,2
+msgtypeBroadcastNotice=184,5,100,1,3
+msgtypeMeOp=189,3,100,1,5
+msgtypeMeDeHalfOp=194,3,100,1,5
+msgtypeMeBanExcept=197,3,100,1,5
+msgtypeMeChanUnAdmin=245,3,100,1,1
+msgtypeMeChanUnOwner=263,3,100,1,2
+mirccolor5=150,0,0
+iccolor7=150,0,170
+boolDrawGenderIcons=true
+colorUserListViewOpForeground=200,0,0
+colorIrcToolBarAppletForegroundHighContrastActive2=0,60,0
+colorTreeWindowListForeground=255,255,255
+colorTreeWindowListHighlight3Foreground=128,0,255
+colorUserListViewGrid=216,216,216
+uintTreeWindowListPixmapAlign=0
+msgtypeCtcpRequestIgnored=53,5,100,1,1
+msgtypeAction=56,13,100,1,3
+msgtypeQuit=58,14,100,1,2
+msgtypeCreationTime=93,15,100,1,1
+msgtypeOwnPrivmsgCrypted=100,0,100,1,3
+msgtypeChannelNoticeCrypted=154,5,100,1,3
+msgtypeAway=170,3,100,1,4
+msgtypeInvite=176,7,100,1,4
+mirccolor6=80,0,80
+pixmapTreeWindowListBackground=
+pixmapGlobalTransparencyBackground=
+boolUseGlobalApplicationFont=false
+boolUseFlatClassicWindowListButtons=false
+colorInputCursor=72,216,72
+colorUserListViewNormalForeground=255,255,255
+colorIrcToolBarAppletForegroundLowContrast=180,180,180
+colorTreeWindowListHighlight4Foreground=220,0,255
+uintGlobalTransparencyParentFadeFactor=10
+uintClassicWindowListMaximumButtonWidth=100
+fontUserListView=Courier%2010%20Pitch,10,0,50,i
+msgtypeNicknameProblem=87,3,100,1,1
+msgtypeWhoisServer=91,2,100,1,1
+msgtypeNotifyOffLine=95,2,100,1,1
+msgtypeKick=110,4,100,1,2
+msgtypeMeDeVoice=192,3,100,1,5
+msgtypeMeDeUserOp=194,3,100,1,1
+msgtypeVerbose=259,15,100,1,0
+msgtypeServerError=272,14,100,1,1
+mirccolor7=255,90,0
+boolUseTreeWindowList=true
+boolUseWindowListActivityMeter=false
+boolStripMircColorsInUserMessages=false
+colorWindowListProgressBar=180,180,180
+colorUserListViewSelectionBackground=194,194,194
+colorTreeWindowListHighlight5Foreground=255,0,0
+msgtypeMotd=30,0,100,1,0
+msgtypeWho=75,2,100,1,1
+msgtypeChanPrivmsgCrypted=101,0,100,1,3
+msgtypeIcq=122,5,100,1,1
+msgtypeChannelNotice=153,5,100,1,3
+msgtypeMeHalfOp=193,3,100,1,5
+msgtypeMeUnban=196,5,100,1,5
+msgtypeDeIrcOp=298,3,100,1,5
+mirccolor8=255,255,0
+boolIrcViewShowImages=false
+boolUseExtendedPrivmsgView=false
+boolUseSpecifiedSmartColorForOwnNick=false
+stringIconThemeSubdir=MinimalDark-1.0.0
+colorInputSelectionForeground=255,128,0
+colorUserListViewHalfOpForeground=119,0,178
+uintGlobalTransparencyChildFadeFactor=30
+uintIrcViewPixmapAlign=33
+fontTreeWindowList=Courier%2010%20Pitch,10,0,50
+msgtypeAvatarChange=57,15,100,1,2
+msgtypeSplit=59,15,100,1,2
+msgtypeInviteExcept=71,15,100,1,1
+msgtypeWhoisOther=92,2,100,1,1
+msgtypeIrc=105,3,100,1,0
+msgtypeGenericVerbose=137,14,100,1,1
+msgtypeGenericWarning=132,5,100,1,0
+msgtypeGenericError=135,4,100,1,1
+msgtypeGenericCritical=134,4,100,1,4
+mirccolor9=0,255,0
+pixmapIrcViewBackground=
+boolIrcViewWrapMargin=true
+boolUseWindowsDesktopForTransparency=false
+boolShowTreeWindowListHeader=false
+colorNotifierForeground=255,255,255
+uintNotifierPixmapAlign=0
+msgtypeSocketMessage=21,14,100,1,1
+msgtypeSocketWarning=22,5,100,1,3
+msgtypeSocketError=23,4,100,1,4
+msgtypeQueryPrivateMessage=48,0,100,1,4
+msgtypeCtcpReply=51,5,100,1,2
+msgtypeNick=61,2,100,1,1
+msgtypeMode=64,15,100,1,1
+msgtypeDccMsg=78,5,100,1,2
+msgtypeServerNotice=141,5,100,1,1
+msgtypeMultimedia=177,5,100,1,2
+msgtypeMeVoice=190,3,100,1,5
+msgtypeChanAdmin=242,3,100,1,1
+msgtypeMeUserOp=193,3,100,1,1
+msgtypeChanOwner=260,3,100,1,2
+msgtypeBitTorrent=177,0,100,1,2
+pixmapNotifierBackground=
+boolShowUserAndHostInPrivmsgView=false
+boolShowUserChannelIcons=true
+stringExtendedPrivmsgPostfix=]%20
+colorMdiBackground=0,0,0
+colorUserListViewBackground=0,0,0
+colorUserListViewVoiceForeground=0,0,200
+colorUserListViewUserOpForeground=0,127,178
+uintUserIrcViewOwnBackground=8
+msgtypeSelection=0,0,15,1,1
+msgtypePart=40,14,100,1,2
+msgtypeQueryPrivmsgCrypted=102,0,100,1,3
+msgtypeMeBanUnExcept=198,3,100,1,5
+msgtypeIrcOp=296,3,100,1,5
+boolIrcViewUrlHighlighting=true
+colorWindowListMinimizedText=60,60,60
+colorNotifierTitleForeground=255,255,255
+colorInputForeground=255,255,255
+colorTreeWindowListProgress=150,150,150
+uintInputPixmapAlign=32
+fontIrcView=Courier%2010%20Pitch,10,0,50
+msgtypeCtcpRequestUnknown=55,5,100,1,2
+msgtypeChanMode=73,15,100,1,1
+msgtypeWhoisUser=88,2,100,1,1
+msgtypeCtcpReplyUnknown=162,5,100,1,1
+msgtypeIgnore=203,15,100,1,1
+msgtypeStats=205,0,100,1,1
+msgtypeSSL=229,2,100,1,0
+msgtypeGenericSuccess=136,14,100,1,3
+msgtypeGenericStatus=133,14,100,1,1
+pixmapInputBackground=
+boolColorNicks=true
+boolShowIconsInPopupMenus=true
+boolUseDifferentColorForOwnNick=true
+boolClassicWindowListSetMaximumButtonWidth=true
+colorWindowListHighlight1Text=0,16,144
+colorUserListViewAwayForeground=143,143,143
+colorTreeWindowListBackground=0,0,0
+colorTreeWindowListActiveForeground=0,0,128
+fontNotifier=Courier%2010%20Pitch,9,0,50
+msgtypeUrl=0,2,100,1,1
+msgtypeTopic=42,3,100,1,1
+msgtypeDeop=62,3,100,1,1
+msgtypeLimit=66,15,100,1,1
+msgtypeBan=67,5,100,1,1
+msgtypeWhoisIdle=90,2,100,1,1
+msgtypeQueryNoticeCrypted=156,5,100,1,3
+msgtypeMeKick=188,4,100,1,5
+colorWindowListHighlight2Text=32,0,255
+uintTimeStampForeground=14
+msgtypeHighlight=0,7,100,1,5
+msgtypeParserError=11,4,100,1,1
+msgtypeParserWarning=12,5,100,1,0
+msgtypeJoinError=182,5,100,1,4
+msgtypeHelp=49,3,100,1,1
+msgtypeTextEncoding=236,0,100,1,0
+msgtypeMeDeIrcOp=300,3,100,1,5
+boolUserListViewDrawGrid=false
+colorLabelForeground=255,255,255
+colorWindowListHighlight3Text=128,20,255
+colorIrcViewMarkLine=0,119,0
+fontInput=Courier%2010%20Pitch,10,0,50
+fontApplication=Courier%2010%20Pitch,12,0,50
+fontNotifierTitle=Courier%2010%20Pitch,9,0,50
+msgtypeConnection=14,5,100,1,1
+msgtypeUnrecognized=41,5,100,1,1
+msgtypeCtcpRequestFlood=54,5,100,1,1
+msgtypeInviteUnexcept=72,15,100,1,1
+msgtypeNotifyOnLine=94,2,100,1,1
+msgtypeLinks=112,2,100,1,1
+msgtypeQueryNotice=155,5,100,1,3
+msgtypeMeInviteExcept=199,3,100,1,5
+msgtypeSearch=206,0,1,1,1
+mirccolor10=0,150,180
+iccolor0=250,250,0
+pixmapLabelBackground=
+pixmapIrcToolBarAppletBackground=
+boolShowUserChannelState=false
+boolUseUserListColorsAsNickColors=false
+colorIrcViewBackground=0,0,0
+colorInputSelectionBackground=198,198,198
+colorIrcToolBarAppletForegroundHighContrastInactive1=220,220,220
+colorWindowListHighlight4Text=220,0,255
+msgtypeOp=34,3,100,1,2
+msgtypeBanExcept=69,15,100,1,1
+msgtypeDccError=79,5,100,1,1
+msgtypeDccChatMsgCrypted=104,0,100,1,3
+msgtypeNickServ=164,5,100,1,2
+msgtypeList=173,0,100,1,1
+msgtypeHalfDeOp=175,3,100,1,2
+msgtypeChanUnAdmin=243,3,100,1,1
+msgtypeMeChanAdmin=244,3,100,1,1
+msgtypeChanUnOwner=261,3,100,1,2
+msgtypeMeChanOwner=262,3,100,1,2
+msgtypeCap=29,0,100,1,1
+mirccolor11=170,170,255
+iccolor1=0,0,0
+colorNotifierBackground=0,0,0
+colorIrcToolBarAppletForegroundMidContrast=110,110,110
+colorIrcToolBarAppletForegroundHighContrastInactive2=195,195,195
+colorWindowListHighlight5Text=255,0,0
+colorUserListViewChanAdminForeground=83,54,5
+colorUserListViewChanOwnerForeground=81,87,111
+uintIrcViewMarkerStyle=0
+msgtypeServerInfo=29,0,100,1,1
+msgtypeMeIrcOp=299,3,100,1,5
+mirccolor0=255,255,255
+mirccolor12=15,15,255
+iccolor2=0,0,200
+boolUseGlobalPseudoTransparency=false
+boolDrawEmoticons=false
+boolUseSpecialColorForTimestamp=true
+colorWindowListNormalText=255,255,255
+colorUserListViewIrcOpForeground=200,0,0
+colorInputBackgroundColor=0,0,0
+colorUserListViewSelectionForeground=255,128,0
+uintIrcViewMarkerSize=1
+fontLabel=Courier%2010%20Pitch,10,0,50
+fontIrcToolBarApplet=Courier%2010%20Pitch,10,0,50,i
+msgtypeQuitSplit=60,14,100,1,2
+msgtypeDevoice=63,3,100,1,1
+msgtypeDccRequest=77,5,100,1,3
+msgtypeWhoisChannels=89,2,100,1,1
+msgtypeDccChatMsg=103,0,100,1,3
+msgtypeIcqMessage=128,5,100,1,1
+msgtypeIcqMessageSent=129,5,100,1,1
+msgtypeUserDeOp=175,3,100,1,1
+mirccolor1=0,0,0
+mirccolor13=200,0,200
+iccolor3=200,0,0
diff --git a/data/deftheme/MinimalDark-1.0.0/themeinfo.kvc b/data/deftheme/MinimalDark-1.0.0/themeinfo.kvc
new file mode 100644
index 000000000..f6a5393c1
--- /dev/null
+++ b/data/deftheme/MinimalDark-1.0.0/themeinfo.kvc
@@ -0,0 +1,9 @@
+# KVIrc configuration file
+[ThemeInfo]
+Date=mar%20feb%2023%2012:46:45%202010
+Name=MinimalDark
+Version=1.0.0
+Author=CtrlAltCa
+ThemeEngineVersion=1.0.0
+Description=A%20minimalistic%20dark%20theme%20with%20a%20monospaced%20font
+Application=KVIrc%204.0.0.20100125
diff --git a/data/pics/kvi_setup_theme_hires.png b/data/pics/kvi_setup_theme_hires.png
index 922fe83cb..838822266 100644
--- a/data/pics/kvi_setup_theme_hires.png
+++ b/data/pics/kvi_setup_theme_hires.png
Binary files differ
diff --git a/data/pics/kvi_setup_theme_lowres.png b/data/pics/kvi_setup_theme_lowres.png
index 74bf7a471..59bdffe65 100644
--- a/data/pics/kvi_setup_theme_lowres.png
+++ b/data/pics/kvi_setup_theme_lowres.png
Binary files differ
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 740401624..22b08e329 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -40,7 +40,7 @@
// this will be chosen during the setup process
QString g_szChoosenIncomingDirectory;
-//int g_iThemeToApply = THEME_APPLY_NONE;
+int g_iThemeToApply = THEME_APPLY_NONE;
bool bNeedToApplyDefaults;
unsigned int uPort;
QString szHost;
@@ -87,22 +87,19 @@ KVIMODULEEXPORTFUNC void setup_finish()
// Apply the chosen default theme
QString szDir;
-/* switch(g_iThemeToApply)
+ KviThemeInfo out;
+ switch(g_iThemeToApply)
{
case THEME_APPLY_HIRES:
- g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"default.hires");
- g_pApp->loadTheme(szDir);
+ g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"YellowIRC-1.0.0");
+ KviTheme::load(szDir,out);
break;
case THEME_APPLY_LORES:
- g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"default.lores");
- g_pApp->loadTheme(szDir);
+ g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"MinimalDark-1.0.0");
+ KviTheme::load(szDir,out);
break;
// default: no theme
- }*/
-
- g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"YellowIRC-1.0.0");
- KviThemeInfo out;
- KviTheme::load(szDir,out);
+ }
if(!szMircServers.isEmpty())
{
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index f0cfb3a22..2ab756fd5 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -59,7 +59,7 @@ bool g_bFoundMirc;
// libkvisetup.cpp
extern QString g_szChoosenIncomingDirectory;
-//extern int g_iThemeToApply;
+extern int g_iThemeToApply;
extern bool bNeedToApplyDefaults;
extern unsigned int uPort;
extern QString szHost;
@@ -420,7 +420,7 @@ KviSetupWizard::KviSetupWizard()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Default theme
-/* m_pTheme = new KviSetupPage(this);
+ m_pTheme = new KviSetupPage(this);
m_pTheme->m_pTextLabel->setText(__tr2qs( \
"<p>Here you can choose the default appearance of KVIrc.<br><br>" \
"The Fancy Theme uses icons, a transparent background and a lot of colors. " \
@@ -430,11 +430,10 @@ KviSetupWizard::KviSetupWizard()
"in order to preserve your current visual settings.<br><br>" \
"If you don't know what to choose, just use the default.</p>"));
- m_pThemeButtonGroup = new KviTalVButtonGroup(m_pTheme->m_pVBox);
+ m_pThemeButtonGroup = new QGroupBox(m_pTheme->m_pVBox);
- KviTalHBox* pThemesHb = new KviTalHBox(m_pThemeButtonGroup);
-
- KviTalVBox* pThemesVb = new KviTalVBox(pThemesHb);
+ QGridLayout *pThemeGrid = new QGridLayout(m_pThemeButtonGroup);
+ m_pThemeButtonGroup->setLayout(pThemeGrid);
QString szThemeImagePath;
g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_hires.png");
@@ -443,19 +442,20 @@ KviSetupWizard::KviSetupWizard()
if(pHiResPixmap->isNull())
{
delete pHiResPixmap;
- pHiResPixmap= new QPixmap(250,200);
+ pHiResPixmap= new QPixmap(200,118);
}
- QLabel* pPixmapLabelHiRes = new QLabel(pThemesVb);
+ QLabel* pPixmapLabelHiRes = new QLabel(m_pThemeButtonGroup);
pPixmapLabelHiRes->setPixmap(*pHiResPixmap);
pPixmapLabelHiRes->setFixedSize(pHiResPixmap->size());
pPixmapLabelHiRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
pPixmapLabelHiRes->setMargin(0);
+ pThemeGrid->addWidget(pPixmapLabelHiRes, 1,1);
+
+ m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),m_pThemeButtonGroup);
+ pThemeGrid->addWidget(m_pThemeHiRes, 2,1);
- m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),pThemesVb);
-
- pThemesVb = new KviTalVBox(pThemesHb);
g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_lowres.png");
QPixmap* pLowResPixmap = new QPixmap(szThemeImagePath);
if(pLowResPixmap->isNull())
@@ -464,23 +464,24 @@ KviSetupWizard::KviSetupWizard()
pLowResPixmap= new QPixmap(250,200);
}
- QLabel* pPixmapLabelLowRes = new QLabel(pThemesVb);
-
+ QLabel* pPixmapLabelLowRes = new QLabel(m_pThemeButtonGroup);
+
pPixmapLabelLowRes->setPixmap(*pLowResPixmap);
pPixmapLabelLowRes->setFixedSize(pLowResPixmap->size());
pPixmapLabelLowRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
pPixmapLabelLowRes->setMargin(0);
-
- m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"),pThemesVb);
+ pThemeGrid->addWidget(pPixmapLabelLowRes, 1,2);
+
+ m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"),m_pThemeButtonGroup);
+ pThemeGrid->addWidget(m_pThemeLoRes, 2,2);
m_pThemeNone = new QRadioButton(__tr2qs("&Don't apply any theme"),m_pThemeButtonGroup);
- m_pThemeButtonGroup->insert(m_pThemeHiRes);
- m_pThemeButtonGroup->insert(m_pThemeLoRes);
-
+ pThemeGrid->addWidget(m_pThemeNone, 3,1);
+
m_pThemeHiRes->setChecked(true);
addPage(m_pTheme,__tr2qs("Default Theme"));
- setHelpEnabled(m_pTheme,false);*/
+ setHelpEnabled(m_pTheme,false);
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Desktop integration
@@ -525,7 +526,7 @@ KviSetupWizard::KviSetupWizard()
"Now you should specify an IRC server, to be connected to it"));
- m_pServersButtonGroup = new KviTalVButtonGroup(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox);
+ m_pServersButtonGroup = new KviTalGroupBox(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox);
m_pServersChooseFromList = new QRadioButton(__tr2qs("Choose from built-in server list"),m_pServersButtonGroup);
@@ -690,7 +691,7 @@ void KviSetupWizard::oldDirClicked()
m_pNewIncomingBox->setEnabled(false);
if(m_pIdentity) setPageEnabled(m_pIdentity,false);
-// if(m_pTheme) setPageEnabled(m_pTheme,false);
+ if(m_pTheme) setPageEnabled(m_pTheme,false);
if(m_pServers) setPageEnabled(m_pServers,false);
if(m_pOldDataPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
@@ -719,7 +720,7 @@ void KviSetupWizard::newDirClicked()
m_pNewIncomingBox->setEnabled(true);
if(m_pIdentity) setPageEnabled(m_pIdentity,true);
-// if(m_pTheme) setPageEnabled(m_pTheme,true);
+ if(m_pTheme) setPageEnabled(m_pTheme,true);
if(m_pServers) setPageEnabled(m_pServers,true);
if(m_pDataPathEdit->text().isEmpty() || m_pIncomingPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
@@ -733,7 +734,7 @@ void KviSetupWizard::portableClicked()
m_pNewIncomingBox->setEnabled(false);
if(m_pIdentity) setPageEnabled(m_pIdentity,true);
-// if(m_pTheme) setPageEnabled(m_pTheme,true);
+ if(m_pTheme) setPageEnabled(m_pTheme,true);
if(m_pServers) setPageEnabled(m_pServers,true);
setNextEnabled(m_pDirectory,true);
@@ -779,7 +780,6 @@ void KviSetupWizard::chooseDataPath()
void KviSetupWizard::chooseIncomingPath()
{
- //QString szBuffer = QFileDialog::getExistingDirectory(m_pIncomingPathEdit->text(),0,0,__tr2qs("Choose the download folder"));
QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pIncomingPathEdit->text(),__tr2qs("Choose a Download Folder - KVIrc Setup"),0);
KviFileUtils::adjustFilePath(szBuffer);
if(!szBuffer.isEmpty())
@@ -1039,19 +1039,19 @@ void KviSetupWizard::accept()
setUrlHandlers();
#endif
-/* if(m_pTheme)
+ if(m_pTheme)
{
- if(m_pThemeButtonGroup->selected() == m_pThemeHiRes)
+ if(m_pThemeHiRes->isChecked())
{
g_iThemeToApply = THEME_APPLY_HIRES;
- } else if(m_pThemeButtonGroup->selected() == m_pThemeLoRes)
+ } else if(m_pThemeLoRes->isChecked())
{
g_iThemeToApply = THEME_APPLY_LORES;
} else {
g_iThemeToApply = THEME_APPLY_NONE;
}
}
-*/
+
if(m_pIdentity)
{
m_pNickSelector->commit();
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index 079c73239..6764a5c82 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -38,8 +38,7 @@
#include <QRadioButton>
#include <QComboBox>
#include <QCheckBox>
-#include <QGroupBox>
-#define KviTalVButtonGroup QGroupBox
+#include <QGridLayout>
class KviSetupWizard;
@@ -74,12 +73,12 @@ public:
KviSetupPage * m_pLicense;
KviSetupPage * m_pDirectory;
KviSetupPage * m_pIdentity;
-// KviSetupPage * m_pTheme;
+ KviSetupPage * m_pTheme;
KviSetupPage * m_pDesktopIntegration;
KviSetupPage * m_pServers;
// Theme
- //KviTalGroupBox * m_pThemeButtonGroup;
+ QGroupBox * m_pThemeButtonGroup;
QRadioButton * m_pThemeHiRes;
QRadioButton * m_pThemeLoRes;
@@ -115,7 +114,7 @@ public:
//KviStringSelector * m_pOtherInfoSelector;
//Servers
- //KviTalVButtonGroup * m_pServersButtonGroup;
+ //KviTalGroupBox * m_pServersButtonGroup;
//QRadioButton * m_pServersChooseFromList;
//QRadioButton * m_pServersSpecifyManually;
//QRadioButton * m_pServersOpenIrcUrl;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:05:57 +0000