Mercurial > hg > forks > UniversalIndentGUI

changeset 491:e3215923077a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adapted the Notepad++ plugin to make use of the new class SettingsPaths. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@731 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Mon, 16 Jun 2008 07:47:31 +0000
parents 0d58db39775f
children 9b091f4bab8d
files src/SettingsPaths.cpp src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.h src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.vcproj
diffstat 4 files changed, 19 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/SettingsPaths.cpp	Mon Jun 16 07:23:56 2008 +0000
+++ b/src/SettingsPaths.cpp	Mon Jun 16 07:47:31 2008 +0000
@@ -33,6 +33,11 @@
 void SettingsPaths::init() {
     // Get the applications binary path, with respect to MacOSXs use of the .app folder. 
 	applicationBinaryPath = QCoreApplication::applicationDirPath();
+
+#ifdef UNIVERSALINDENTGUI_NPP_EXPORTS
+    applicationBinaryPath += "/plugins/uigui";
+#endif
+
 #ifdef Q_OS_MAC
     // Because on Mac universal binaries are used, the binary path is not equal
 	// to the applications (.app) path. So get the .apps path here.
@@ -84,6 +89,8 @@
 #endif
         dirCreator.mkpath( tempPath );
     }
+
+    alreadyInitialized = true;
 }
 
 
--- a/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp	Mon Jun 16 07:23:56 2008 +0000
+++ b/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp	Mon Jun 16 07:47:31 2008 +0000
@@ -64,7 +64,7 @@
                 int argc = 1;
                 char *argv[] = {"setup", NULL};
                 static QApplication qapp(argc, argv);
-                indentHandler = new IndentHandler("E:/EigeneDateien/Dokumente/Informatik/UniversalIndentGUI/indenters", "E:/EigeneDateien/Dokumente/Informatik/UniversalIndentGUI/config", "E:/EigeneDateien/Dokumente/Informatik/UniversalIndentGUI/temp", 0);
+                indentHandler = new IndentHandler( SettingsPaths::getIndenterPath(), SettingsPaths::getSettingsPath(), SettingsPaths::getTempPath(), 0);
                 indentHandler->setWindowModality( Qt::ApplicationModal );
                 indentHandler->setWindowTitle("UniversalIndentGUI");
                 //qapp.setActiveWindow(indentHandler);
--- a/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.h	Mon Jun 16 07:23:56 2008 +0000
+++ b/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.h	Mon Jun 16 07:47:31 2008 +0000
@@ -28,6 +28,8 @@
 #include "Scintilla.h"
 #include <TCHAR.H>
 
+#include "SettingsPaths.h"
+
 /* menu position in funcItem */
 #define	TOGGLE_DOCKABLE_WINDOW_INDEX	0
 
--- a/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.vcproj	Mon Jun 16 07:23:56 2008 +0000
+++ b/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.vcproj	Mon Jun 16 07:47:31 2008 +0000
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="shlwapi.lib comctl32.lib qtmaind.lib QtGuid4.lib QtCored4.lib QtScriptd4.lib "
-				OutputFile="D:\Programme\Tools\Notepad++\plugins\$(ProjectName).dll"
+				OutputFile="C:\Programme\Notepad++\plugins\$(ProjectName).dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/UniversalIndentGUI_NPP.pdb"
@@ -212,6 +212,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\SettingsPaths.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\uiguierrormessage.cpp"
 				>
 			</File>
@@ -273,6 +277,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\SettingsPaths.h"
+				>
+			</File>
+			<File
 				RelativePath="..\uiguierrormessage.h"
 				>
 			</File>