diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 19 | ||||
| -rw-r--r-- | src/modules/about/ENTRIES | 2 | ||||
| -rw-r--r-- | src/modules/about/abouttext.inc | 40 |
3 files changed, 34 insertions, 27 deletions
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 94e29cbe5..64faab87a 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -39,8 +39,8 @@ #include "kvi_sourcesdate.h" #include "kvi_iconmanager.h" #include "kvi_config.h" -
-#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
+ +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include <shlwapi.h> #include <windows.h> // at least for GetModuleFileName and *PrivateProfileString #else @@ -484,10 +484,11 @@ void KviApp::setupFileAssociations() #endif } +/* //#ifdef BRAIN_DAMAGED_AUTHOR_PARANOIA //#define I_DO_NOT_WANT_TO_HEAR_IT_ANYMORE_THAT_KVIRC_CAN_NOT_FIND_THE_BASE_PIXMAPS -// search paths for Unix-like platforms
+// search paths for Unix-like platforms #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) const char * usualKvircGlobalPrePath[]= { @@ -513,6 +514,7 @@ void KviApp::setupFileAssociations() #endif //#endif //BRAIN_DAMAGED_AUTHOR_PARANOIA +*/ void KviApp::findGlobalKvircDirectory() { @@ -570,7 +572,12 @@ void KviApp::findGlobalKvircDirectory() if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; #endif //COMPILE_ON_MAC + m_szGlobalKvircDir = KVIRC_RESOURCES_DIR; + if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; + +/* // Check usual directories... + for(int j=0;usualKvircGlobalPrePath[j] != 0;j++){ for(int i=0;usualKvircGlobalDir[i] != 0;i++){ m_szGlobalKvircDir = usualKvircGlobalPrePath[j]; @@ -597,7 +604,7 @@ void KviApp::findGlobalKvircDirectory() if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; } #endif //COMPILE_KDE_SUPPORT - +*/ m_szGlobalKvircDir=""; // DO NOT TRANSLATE THIS @@ -731,8 +738,8 @@ void KviApp::setupBegin() QString szSetupLib; getGlobalKvircDirectory(szSetupLib,KviApp::Modules); KviQString::ensureLastCharIs(szSetupLib,KVI_PATH_SEPARATOR_CHAR); -#if defined(COMPILE_ON_WINDOWS)
- szSetupLib.append("kvisetup.dll");
+#if defined(COMPILE_ON_WINDOWS) + szSetupLib.append("kvisetup.dll"); #elif defined(COMPILE_ON_MINGW) szSetupLib.append("libkvisetup.dll"); #else diff --git a/src/modules/about/ENTRIES b/src/modules/about/ENTRIES index b5fefbfa3..cff627f19 100644 --- a/src/modules/about/ENTRIES +++ b/src/modules/about/ENTRIES @@ -35,7 +35,7 @@ ROLE: To be continued :-) NAME: Fabio Bas NICK: CtrlAltCa MAIL: ctrlaltca at gmail dot com -ROLE: Bugfixing, coding, user support +ROLE: Bugfixing, coding, mingw32 port, user support TEXT: Can i haz KVIrc? NAME: Thomas Kalla diff --git a/src/modules/about/abouttext.inc b/src/modules/about/abouttext.inc index 9e94c8c64..09d8ceee7 100644 --- a/src/modules/about/abouttext.inc +++ b/src/modules/about/abouttext.inc @@ -118,7 +118,7 @@ static const char * g_szAboutText = "" \ "]" \ "</font></td></tr>" \ "<tr><td align=\"center\"><font color=\"#303030\">" \ -"Bugfixing, coding, user support" \ +"Bugfixing, coding, mingw32 port, user support" \ "</font></td></tr>" \ "<tr><td align=\"center\"><font color=\"#606060\"><i>" \ "\"Can i haz KVIrc?\"" \ @@ -135,25 +135,6 @@ static const char * g_szAboutText = "" \ "MacOS X porting" \ "</font></td></tr>" \ "</table><br><br>" \ -"<table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">" \ -"<tr><td align=\"center\">" \ -"<font color=\"#000000\" size=\"+2\"><b>TheXception</b></font>" \ -"</td></tr>" \ -"<tr><td align=\"center\"><font color=\"#800020\" size=\"+2\"> (" \ -"TheXception" \ -")</font></td></tr>" \ -"<tr><td align=\"center\"><font color=\"#0000FF\" size=\"+1\">" \ -"[" \ -"kvirc@thexception.net" \ -"]" \ -"</font></td></tr>" \ -"<tr><td align=\"center\"><font color=\"#303030\">" \ -"bugfixes, german tutorials, core development" \ -"</font></td></tr>" \ -"<tr><td align=\"center\"><font color=\"#606060\"><i>" \ -"\"everything is possible, it only needs its time.\"" \ -"</i></font></td></tr>" \ -"</table><br><br>" \ "<br><table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">" \ "<tr><td align=\"center\">" \ "<font color=\"#000000\" size=\"+3\"><b>Translators</b></font>" \ @@ -877,6 +858,25 @@ static const char * g_szAboutText = "" \ "</table><br><br>" \ "<table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">" \ "<tr><td align=\"center\">" \ +"<font color=\"#000000\" size=\"+2\"><b>TheXception</b></font>" \ +"</td></tr>" \ +"<tr><td align=\"center\"><font color=\"#800020\" size=\"+2\"> (" \ +"TheXception" \ +")</font></td></tr>" \ +"<tr><td align=\"center\"><font color=\"#0000FF\" size=\"+1\">" \ +"[" \ +"kvirc@thexception.net" \ +"]" \ +"</font></td></tr>" \ +"<tr><td align=\"center\"><font color=\"#303030\">" \ +"bugfixes, german tutorials" \ +"</font></td></tr>" \ +"<tr><td align=\"center\"><font color=\"#606060\"><i>" \ +"\"everything is possible, it only needs its time.\"" \ +"</i></font></td></tr>" \ +"</table><br><br>" \ +"<table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">" \ +"<tr><td align=\"center\">" \ "<font color=\"#000000\" size=\"+2\"><b>Lorenzo Marcon</b></font>" \ "</td></tr>" \ "<tr><td align=\"center\"><font color=\"#800020\" size=\"+2\"> (" \ |