Mercurial > hg > forks > UniversalIndentGUI
changeset 634:82cd1efd6015
Talking about clean and well formatted code all the time and never run mine through a beautifier while still having a mix of tabs an spaces. So now Uncrustify has cleaned my code. Still two unsatisfying points are left. indenthandler.cpp line 467 a space between case label and colon has been removed and like on line 503 some code lines got indented without setting that explicitly.
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@893 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Tue, 11 Nov 2008 11:12:36 +0000 |
| parents | cf48ce614b8c |
| children | e1fdfb9adf92 |
| files | src/AboutDialogGraphicsView.cpp src/SettingsPaths.cpp src/UiguiHighlighter.cpp src/UiguiIndentServer.cpp src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/ImageListSet.cpp src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/StaticDialog.cpp src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/SysMsg.cpp src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/ToolBar.cpp src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPPDialog.cpp src/aboutdialog.cpp src/indenthandler.cpp src/main.cpp src/mainwindow.cpp src/templateBatchScript.cpp src/uiguiIniFileParser.cpp src/uiguierrormessage.cpp src/uiguisettings.cpp src/uiguisettingsdialog.cpp src/updatecheckdialog.cpp |
| diffstat | 20 files changed, 1130 insertions(+), 1200 deletions(-) [+] |
line wrap: on
line diff
--- a/src/AboutDialogGraphicsView.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/AboutDialogGraphicsView.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -22,7 +22,7 @@ /*! \class AboutDialogGraphicsView \brief A container for the real \a AboutDialog. Makes the 3D animation possible. - + The 3D animation shall suggest the user, that he is looking at his desktop, while this animation is done. Since this is not directly possible, \a AboutDialogGraphicsView when shown starts in frameless fullscreen mode with a screenshot of the desktop as background. @@ -62,7 +62,7 @@ connect(aboutDialog, SIGNAL(finished(int)), this, SLOT(hide())); //setWindowOpacity(0.9); - + setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setStyleSheet("AboutDialogGraphicsView { border: 0px; }"); @@ -99,7 +99,7 @@ graphicsProxyWidget->setGeometry( aboutDialog->geometry() ); if ( firstRunOfAnimation ) { graphicsProxyWidget->setPos( parent->geometry().x()+(parent->geometry().width()-graphicsProxyWidget->geometry().width()) / 2, parent->y()+windowTitleBarWidth); - } + } else { graphicsProxyWidget->setPos( parent->geometry().x()+(parent->geometry().width()-graphicsProxyWidget->geometry().width()) / 2, parent->y()+windowTitleBarWidth); } @@ -158,11 +158,11 @@ aboutDialogAsSplashScreen->setPixmap( QPixmap::grabWidget(aboutDialog) ); graphicsProxyWidget->setGeometry( aboutDialog->geometry() ); //if ( firstRunOfAnimation ) { - firstRunOfAnimation = false; + firstRunOfAnimation = false; // graphicsProxyWidget->setPos( parent->geometry().x()+(parent->geometry().width()-graphicsProxyWidget->geometry().width()) / 2, parent->y()); - //} + //} //else { - graphicsProxyWidget->setPos( parent->geometry().x()+(parent->geometry().width()-graphicsProxyWidget->geometry().width()) / 2, parent->y()+windowTitleBarWidth); + graphicsProxyWidget->setPos( parent->geometry().x()+(parent->geometry().width()-graphicsProxyWidget->geometry().width()) / 2, parent->y()+windowTitleBarWidth); //} QRectF r = graphicsProxyWidget->boundingRect();
--- a/src/SettingsPaths.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/SettingsPaths.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -41,17 +41,17 @@ /*! \brief Initializes all available information about the paths. - + Mainly during this init it is detected whether to start in portable mode or not. This is - done by testing whether the directory "config" is in the same directory as this + done by testing whether the directory "config" is in the same directory as this applications executable file. In portable mode all data is ONLY written to subdirectories of the applications executable file. Means also that the directory "indenters" has to be there. In not portable mode (multiuser mode) only users home directory is used for writing config data. */ void SettingsPaths::init() { - // Get the applications binary path, with respect to MacOSXs use of the .app folder. - applicationBinaryPath = QCoreApplication::applicationDirPath(); + // Get the applications binary path, with respect to MacOSXs use of the .app folder. + applicationBinaryPath = QCoreApplication::applicationDirPath(); // Remove any trailing slashes while ( applicationBinaryPath.right(1) == "/" ) { applicationBinaryPath.chop(1); @@ -63,14 +63,14 @@ #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. + // to the applications (.app) path. So get the .apps path here. int indexOfDotApp = applicationBinaryPath.indexOf(".app"); if ( indexOfDotApp != -1 ) { - // Cut off after the dot of ".app". - applicationBinaryPath = applicationBinaryPath.left( indexOfDotApp-1 ); - // Cut off after the first slash that was in front of ".app" (normally this is the word "UniversalIndentGUI") - applicationBinaryPath = applicationBinaryPath.left( applicationBinaryPath.lastIndexOf("/") ); - } + // Cut off after the dot of ".app". + applicationBinaryPath = applicationBinaryPath.left( indexOfDotApp-1 ); + // Cut off after the first slash that was in front of ".app" (normally this is the word "UniversalIndentGUI") + applicationBinaryPath = applicationBinaryPath.left( applicationBinaryPath.lastIndexOf("/") ); + } #endif // If the "config" directory is a subdir of the applications binary path, use this one (portable mode) @@ -97,7 +97,7 @@ settingsPath.chop(1); } settingsPath = settingsPath + "/UniversalIndentGUI"; - + // On windows systems the directories "indenters", "translations" are subdirs of the applicationBinaryPath. globalFilesPath = applicationBinaryPath; #else
--- a/src/UiguiHighlighter.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UiguiHighlighter.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -35,7 +35,7 @@ \brief The constructor initializes some regular expressions and keywords to identify cpp tokens */ UiguiHighlighter::UiguiHighlighter(QsciScintilla *parent) -: QObject(parent) + : QObject(parent) { this->qsciEditorParent = parent; @@ -111,7 +111,7 @@ \brief This slot handles signals coming from selecting another syntax highlighter. */ void UiguiHighlighter::setHighlighterByAction(QAction* highlighterAction) { - QString highlighterName = highlighterAction->text(); + QString highlighterName = highlighterAction->text(); setLexerForExtension( mapHighlighternameToExtension[highlighterName].first() ); //TODO: This is really no nice way. How do it better? // Need to do this "text update" to update the syntax highlighting. Otherwise highlighting is wrong. @@ -161,14 +161,13 @@ colorForStyles.clear(); // Read the styles. - for (int i = 0; i < 128; ++i) - { + for (int i = 0; i < 128; ++i) { // Ignore invalid styles. if ( lexer->description(i).isEmpty() ) continue; key.sprintf( "%s/%s/style%d/", prefix, lexer->language(), i ); - key.replace("+", "p"); + key.replace("+", "p"); // Read the foreground color. ok = settings->contains(key + "color"); @@ -194,8 +193,7 @@ ok = settings->contains(key + "font"); fdesc = settings->value(key + "font").toStringList(); - if (ok && fdesc.count() == 5) - { + if (ok && fdesc.count() == 5) { QFont f; #ifdef Q_OS_WIN @@ -252,18 +250,18 @@ QColor c; key.sprintf( "%s/%s/style%d/", prefix, lexer->language(), i ); - key.replace("+", "p"); + key.replace("+", "p"); - // Write style name - settings->setValue( key + "", lexer->description(i) ); + // Write style name + settings->setValue( key + "", lexer->description(i) ); // Write the foreground color. - if ( colorForStyles.contains(i) ) { - c = colorForStyles[i]; - } - else { - c = lexer->color(i); - } + if ( colorForStyles.contains(i) ) { + c = colorForStyles[i]; + } + else { + c = lexer->color(i); + } num = (c.red() << 16) | (c.green() << 8) | c.blue(); settings->setValue(key + "color", num); @@ -276,12 +274,12 @@ QString fmt("%1"); QFont f; - if ( fontForStyles.contains(i) ) { - f = fontForStyles[i]; - } - else { - f = lexer->font(i); - } + if ( fontForStyles.contains(i) ) { + f = fontForStyles[i]; + } + else { + f = lexer->font(i); + } fdesc += f.family(); fdesc += fmt.arg( f.pointSize() ); @@ -333,37 +331,37 @@ */ int UiguiHighlighter::setLexerForExtension( QString extension ) { int indexOfHighlighter = 0; - extension = extension.toLower(); + extension = extension.toLower(); - if ( lexer != NULL ) { - writeCurrentSettings(""); - delete lexer; - } + if ( lexer != NULL ) { + writeCurrentSettings(""); + delete lexer; + } - if ( extension == "cpp" || extension == "hpp" || extension == "c" || extension == "h" || extension == "cxx" || extension == "hxx" ) { - lexer = new QsciLexerCPP(); - } - else if ( extension == "sh" ) { - lexer = new QsciLexerBash(); - } - else if ( extension == "bat" ) { - lexer = new QsciLexerBatch(); - } + if ( extension == "cpp" || extension == "hpp" || extension == "c" || extension == "h" || extension == "cxx" || extension == "hxx" ) { + lexer = new QsciLexerCPP(); + } + else if ( extension == "sh" ) { + lexer = new QsciLexerBash(); + } + else if ( extension == "bat" ) { + lexer = new QsciLexerBatch(); + } else if ( extension == "cmake" ) { lexer = new QsciLexerCMake(); } - else if ( extension == "cs" ) { - lexer = new QsciLexerCSharp(); - } - else if ( extension == "css" ) { - lexer = new QsciLexerCSS(); - } - else if ( extension == "d" ) { - lexer = new QsciLexerD(); - } - else if ( extension == "diff" ) { - lexer = new QsciLexerDiff(); - } + else if ( extension == "cs" ) { + lexer = new QsciLexerCSharp(); + } + else if ( extension == "css" ) { + lexer = new QsciLexerCSS(); + } + else if ( extension == "d" ) { + lexer = new QsciLexerD(); + } + else if ( extension == "diff" ) { + lexer = new QsciLexerDiff(); + } #if ( QSCINTILLA_VERSION >= 0x020300 ) else if ( extension == "f" || extension == "for" ) { lexer = new QsciLexerFortran(); @@ -372,82 +370,82 @@ lexer = new QsciLexerFortran77(); } #endif - else if ( extension == "html" || extension == "htm" ) { - lexer = new QsciLexerHTML(); - } - else if ( extension == "idl" ) { - lexer = new QsciLexerIDL(); - } - else if ( extension == "java" ) { - lexer = new QsciLexerJava(); - } - else if ( extension == "js" ) { - lexer = new QsciLexerJavaScript(); - } - else if ( extension == "lua" ) { - lexer = new QsciLexerLua(); - } + else if ( extension == "html" || extension == "htm" ) { + lexer = new QsciLexerHTML(); + } + else if ( extension == "idl" ) { + lexer = new QsciLexerIDL(); + } + else if ( extension == "java" ) { + lexer = new QsciLexerJava(); + } + else if ( extension == "js" ) { + lexer = new QsciLexerJavaScript(); + } + else if ( extension == "lua" ) { + lexer = new QsciLexerLua(); + } else if ( extension == "makefile" ) { - lexer = new QsciLexerMakefile(); - } + lexer = new QsciLexerMakefile(); + } #if ( QSCINTILLA_VERSION >= 0x020300 ) else if ( extension == "pas" ) { lexer = new QsciLexerPascal(); } #endif - else if ( extension == "perl" || extension == "pl" || extension == "pm" ) { - lexer = new QsciLexerPerl(); - } + else if ( extension == "perl" || extension == "pl" || extension == "pm" ) { + lexer = new QsciLexerPerl(); + } else if ( extension == "php" ) { - lexer = new QsciLexerHTML(); - } + lexer = new QsciLexerHTML(); + } #if ( QSCINTILLA_VERSION >= 0x020300 ) else if ( extension == "ps" || extension == "eps" || extension == "pdf" || extension == "ai" || extension == "fh") { lexer = new QsciLexerPostScript(); } #endif - else if ( extension == "pov" ) { - lexer = new QsciLexerPOV(); - } - else if ( extension == "ini" ) { - lexer = new QsciLexerProperties(); - } - else if ( extension == "py" ) { - lexer = new QsciLexerPython(); - } - else if ( extension == "rub" || extension == "rb" ) { - lexer = new QsciLexerRuby(); - } - else if ( extension == "sql" ) { - lexer = new QsciLexerSQL(); - } + else if ( extension == "pov" ) { + lexer = new QsciLexerPOV(); + } + else if ( extension == "ini" ) { + lexer = new QsciLexerProperties(); + } + else if ( extension == "py" ) { + lexer = new QsciLexerPython(); + } + else if ( extension == "rub" || extension == "rb" ) { + lexer = new QsciLexerRuby(); + } + else if ( extension == "sql" ) { + lexer = new QsciLexerSQL(); + } #if ( QSCINTILLA_VERSION >= 0x020300 ) else if ( extension == "tcl" ) { lexer = new QsciLexerTCL(); } #endif - else if ( extension == "tex" ) { - lexer = new QsciLexerTeX(); - } + else if ( extension == "tex" ) { + lexer = new QsciLexerTeX(); + } else if ( extension == "vhdl" ) { lexer = new QsciLexerVHDL(); } else if ( extension == "xml" ) { #if ( QSCINTILLA_VERSION >= 0x020300 ) - lexer = new QsciLexerXML(); + lexer = new QsciLexerXML(); #else lexer = new QsciLexerHTML(); #endif - } + } #if ( QSCINTILLA_VERSION >= 0x020300 ) else if ( extension == "yaml" ) { lexer = new QsciLexerYAML(); } #endif - else { - lexer = new QsciLexerCPP(); + else { + lexer = new QsciLexerCPP(); extension = "cpp"; - } + } // Find the index of the selected lexer. indexOfHighlighter = 0; @@ -457,11 +455,11 @@ // Set the lexer for the QScintilla widget. if ( highlightningIsOn ) { - qsciEditorParent->setLexer(lexer); + qsciEditorParent->setLexer(lexer); } // Read the settings for the lexer properties from file. - readCurrentSettings(""); + readCurrentSettings(""); return indexOfHighlighter; }
--- a/src/UiguiIndentServer.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UiguiIndentServer.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -29,7 +29,7 @@ \brief UiguiIndentServer is in such an early state, that even the communication protocol isn't completely planned. So this class lacks documentation until I really know where all this will lead to. - + The plan however is to have a server that receives commands for selecting an indenter and perhaps load some by the user predefined indenter config file. Then the client can send a text to it and will receive it formatted. @@ -89,7 +89,6 @@ void UiguiIndentServer::handleReceivedData() { - if ( !readyForHandleRequest ) { return; }
--- a/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/ImageListSet.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/ImageListSet.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -20,51 +20,49 @@ void ToolBarIcons::init(ToolBarButtonUnit *buttonUnitArray, int arraySize) { - for (int i = 0 ; i < arraySize ; i++) - _tbiis.push_back(buttonUnitArray[i]); + for (int i = 0 ; i < arraySize ; i++) + _tbiis.push_back(buttonUnitArray[i]); } void ToolBarIcons::create(HINSTANCE hInst, int iconSize) { - _iconListVector.push_back(IconList()); - _iconListVector.push_back(IconList()); - _iconListVector.push_back(IconList()); - //_iconListVector.push_back(IconList()); + _iconListVector.push_back(IconList()); + _iconListVector.push_back(IconList()); + _iconListVector.push_back(IconList()); + //_iconListVector.push_back(IconList()); - _iconListVector[HLIST_DEFAULT].create(hInst, iconSize); - _iconListVector[HLIST_HOT].create(hInst, iconSize); - _iconListVector[HLIST_DISABLE].create(hInst, iconSize); - //_iconListVector[HLIST_UGLY].create(hInst, 16); + _iconListVector[HLIST_DEFAULT].create(hInst, iconSize); + _iconListVector[HLIST_HOT].create(hInst, iconSize); + _iconListVector[HLIST_DISABLE].create(hInst, iconSize); + //_iconListVector[HLIST_UGLY].create(hInst, 16); - for (size_t i = 0 ; i < _tbiis.size() ; i++) - { - _cmdArray[_nbCmd++] = _tbiis[i]._cmdID; - if (_tbiis[i]._defaultIcon != IDI_SEPARATOR_ICON) - { - _iconListVector[HLIST_DEFAULT].addIcon(_tbiis[i]._defaultIcon); - _iconListVector[HLIST_HOT].addIcon(_tbiis[i]._hotIcon); - _iconListVector[HLIST_DISABLE].addIcon(_tbiis[i]._grayIcon); - //_iconListVector[HLIST_UGLY].addImage(_tbiis[i]._uglyIcon); - } - } + for (size_t i = 0 ; i < _tbiis.size() ; i++) { + _cmdArray[_nbCmd++] = _tbiis[i]._cmdID; + if (_tbiis[i]._defaultIcon != IDI_SEPARATOR_ICON) { + _iconListVector[HLIST_DEFAULT].addIcon(_tbiis[i]._defaultIcon); + _iconListVector[HLIST_HOT].addIcon(_tbiis[i]._hotIcon); + _iconListVector[HLIST_DISABLE].addIcon(_tbiis[i]._grayIcon); + //_iconListVector[HLIST_UGLY].addImage(_tbiis[i]._uglyIcon); + } + } } void ToolBarIcons::destroy() { - _iconListVector[HLIST_DEFAULT].destroy(); - _iconListVector[HLIST_HOT].destroy(); - _iconListVector[HLIST_DISABLE].destroy(); - //_iconListVector[HLIST_UGLY].destroy(); + _iconListVector[HLIST_DEFAULT].destroy(); + _iconListVector[HLIST_HOT].destroy(); + _iconListVector[HLIST_DISABLE].destroy(); + //_iconListVector[HLIST_UGLY].destroy(); } /* -bool IconList::changeIcon(int index, const char *iconLocation) const +bool IconList::changeIcon(int index, const char *iconLocation) const { - HBITMAP hBmp = (HBITMAP)::LoadImage(_hInst, iconLocation, IMAGE_ICON, _iconSize, _iconSize, LR_LOADFROMFILE ); - if (!hBmp) - return false; - int i = ImageList_ReplaceIcon(_hImglst, index, (HICON)hBmp); - ::DeleteObject(hBmp); - return (i == index); + HBITMAP hBmp = (HBITMAP)::LoadImage(_hInst, iconLocation, IMAGE_ICON, _iconSize, _iconSize, LR_LOADFROMFILE ); + if (!hBmp) + return false; + int i = ImageList_ReplaceIcon(_hImglst, index, (HICON)hBmp); + ::DeleteObject(hBmp); + return (i == index); } */
--- a/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/StaticDialog.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/StaticDialog.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -30,79 +30,77 @@ center.y = rc.top + (rc.bottom - rc.top)/2; ::ClientToScreen(_hParent, ¢er); - int x = center.x - (_rc.right - _rc.left)/2; - int y = center.y - (_rc.bottom - _rc.top)/2; + int x = center.x - (_rc.right - _rc.left)/2; + int y = center.y - (_rc.bottom - _rc.top)/2; - ::SetWindowPos(_hSelf, HWND_TOP, x, y, _rc.right - _rc.left, _rc.bottom - _rc.top, SWP_SHOWWINDOW); + ::SetWindowPos(_hSelf, HWND_TOP, x, y, _rc.right - _rc.left, _rc.bottom - _rc.top, SWP_SHOWWINDOW); } HGLOBAL StaticDialog::makeRTLResource(int dialogID, DLGTEMPLATE **ppMyDlgTemplate) { - // Get Dlg Template resource - HRSRC hDialogRC = ::FindResource(_hInst, MAKEINTRESOURCE(dialogID), RT_DIALOG); - HGLOBAL hDlgTemplate = ::LoadResource(_hInst, hDialogRC); - DLGTEMPLATE *pDlgTemplate = (DLGTEMPLATE *)::LockResource(hDlgTemplate); - - // Duplicate Dlg Template resource - unsigned long sizeDlg = ::SizeofResource(_hInst, hDialogRC); - HGLOBAL hMyDlgTemplate = ::GlobalAlloc(GPTR, sizeDlg); - *ppMyDlgTemplate = (DLGTEMPLATE *)::GlobalLock(hMyDlgTemplate); + // Get Dlg Template resource + HRSRC hDialogRC = ::FindResource(_hInst, MAKEINTRESOURCE(dialogID), RT_DIALOG); + HGLOBAL hDlgTemplate = ::LoadResource(_hInst, hDialogRC); + DLGTEMPLATE *pDlgTemplate = (DLGTEMPLATE *)::LockResource(hDlgTemplate); + + // Duplicate Dlg Template resource + unsigned long sizeDlg = ::SizeofResource(_hInst, hDialogRC); + HGLOBAL hMyDlgTemplate = ::GlobalAlloc(GPTR, sizeDlg); + *ppMyDlgTemplate = (DLGTEMPLATE *)::GlobalLock(hMyDlgTemplate); - ::memcpy(*ppMyDlgTemplate, pDlgTemplate, sizeDlg); - - DLGTEMPLATEEX *pMyDlgTemplateEx = (DLGTEMPLATEEX *)*ppMyDlgTemplate; - if (pMyDlgTemplateEx->signature == 0xFFFF) - pMyDlgTemplateEx->exStyle |= WS_EX_LAYOUTRTL; - else - (*ppMyDlgTemplate)->dwExtendedStyle |= WS_EX_LAYOUTRTL; + ::memcpy(*ppMyDlgTemplate, pDlgTemplate, sizeDlg); - return hMyDlgTemplate; + DLGTEMPLATEEX *pMyDlgTemplateEx = (DLGTEMPLATEEX *)*ppMyDlgTemplate; + if (pMyDlgTemplateEx->signature == 0xFFFF) + pMyDlgTemplateEx->exStyle |= WS_EX_LAYOUTRTL; + else + (*ppMyDlgTemplate)->dwExtendedStyle |= WS_EX_LAYOUTRTL; + + return hMyDlgTemplate; } void StaticDialog::create(int dialogID, bool isRTL) { - if (isRTL) - { - DLGTEMPLATE *pMyDlgTemplate = NULL; - HGLOBAL hMyDlgTemplate = makeRTLResource(dialogID, &pMyDlgTemplate); - _hSelf = ::CreateDialogIndirectParam(_hInst, pMyDlgTemplate, _hParent, (DLGPROC)dlgProc, (LPARAM)this); - ::GlobalFree(hMyDlgTemplate); - } - else - _hSelf = ::CreateDialogParam(_hInst, MAKEINTRESOURCE(dialogID), _hParent, (DLGPROC)dlgProc, (LPARAM)this); + if (isRTL) { + DLGTEMPLATE *pMyDlgTemplate = NULL; + HGLOBAL hMyDlgTemplate = makeRTLResource(dialogID, &pMyDlgTemplate); + _hSelf = ::CreateDialogIndirectParam(_hInst, pMyDlgTemplate, _hParent, (DLGPROC)dlgProc, (LPARAM) this); + ::GlobalFree(hMyDlgTemplate); + } + else + _hSelf = ::CreateDialogParam(_hInst, MAKEINTRESOURCE(dialogID), _hParent, (DLGPROC)dlgProc, (LPARAM) this); - if (!_hSelf) - { - systemMessage("StaticDialog"); - throw int(666); - } + if (!_hSelf) { + systemMessage("StaticDialog"); + throw int(666); + } - ::SendMessage(_hParent, NPPM_MODELESSDIALOG, MODELESSDIALOGADD, (WPARAM)_hSelf); + ::SendMessage(_hParent, NPPM_MODELESSDIALOG, MODELESSDIALOGADD, (WPARAM)_hSelf); } -BOOL CALLBACK StaticDialog::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK StaticDialog::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) - { - case WM_INITDIALOG : - { - StaticDialog *pStaticDlg = (StaticDialog *)(lParam); - pStaticDlg->_hSelf = hwnd; - ::SetWindowLong(hwnd, GWL_USERDATA, (long)lParam); - ::GetWindowRect(hwnd, &(pStaticDlg->_rc)); + switch (message) + { + case WM_INITDIALOG: + { + StaticDialog *pStaticDlg = (StaticDialog *)(lParam); + pStaticDlg->_hSelf = hwnd; + ::SetWindowLong(hwnd, GWL_USERDATA, (long)lParam); + ::GetWindowRect(hwnd, &(pStaticDlg->_rc)); pStaticDlg->run_dlgProc(hwnd, message, wParam, lParam); - - return TRUE; - } + + return TRUE; + } - default : - { - StaticDialog *pStaticDlg = reinterpret_cast<StaticDialog *>(::GetWindowLong(hwnd, GWL_USERDATA)); - if (!pStaticDlg) - return FALSE; - return pStaticDlg->run_dlgProc(hwnd, message, wParam, lParam); - } - } + default: + { + StaticDialog *pStaticDlg = reinterpret_cast<StaticDialog *>(::GetWindowLong(hwnd, GWL_USERDATA)); + if (!pStaticDlg) + return FALSE; + return pStaticDlg->run_dlgProc(hwnd, message, wParam, lParam); + } + } } void StaticDialog::alignWith(HWND handle, HWND handle2Align, PosAlign pos, POINT & point) @@ -115,26 +113,26 @@ switch (pos) { - case ALIGNPOS_LEFT : + case ALIGNPOS_LEFT: ::GetWindowRect(handle2Align, &rc2); point.x -= rc2.right - rc2.left; break; - case ALIGNPOS_RIGHT : + case ALIGNPOS_RIGHT: ::GetWindowRect(handle, &rc2); point.x += rc2.right - rc2.left; break; - case ALIGNPOS_TOP : + case ALIGNPOS_TOP: ::GetWindowRect(handle2Align, &rc2); point.y -= rc2.bottom - rc2.top; break; - default : //ALIGNPOS_BOTTOM + default: //ALIGNPOS_BOTTOM ::GetWindowRect(handle, &rc2); point.y += rc2.bottom - rc2.top; break; } - + ::ScreenToClient(_hSelf, &point); }
--- a/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/SysMsg.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/SysMsg.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -23,8 +23,7 @@ DWORD ShortToLongPathName(LPCTSTR lpszShortPath, LPTSTR lpszLongPath, DWORD cchBuffer) { // Catch null pointers. - if (!lpszShortPath || !lpszLongPath) - { + if (!lpszShortPath || !lpszLongPath) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -43,7 +42,7 @@ typedef tstring::size_type size; size const npos = tstring::npos; - // Copy the short path into the work buffer and convert forward + // Copy the short path into the work buffer and convert forward // slashes to backslashes. tstring path = lpszShortPath; std::replace(path.begin(), path.end(), '/', sep); @@ -53,36 +52,27 @@ size right = 0; // Parse the first bit of the path. - if (path.length() >= 2 && isalpha(path[0]) && colon == path[1]) // Drive letter? - { - if (2 == path.length()) // 'bare' drive letter - { + if (path.length() >= 2 && isalpha(path[0]) && colon == path[1]) { // Drive letter? + if (2 == path.length()) { // 'bare' drive letter right = npos; // skip main block } - else if (sep == path[2]) // drive letter + backslash - { + else if (sep == path[2]) { // drive letter + backslash // FindFirstFile doesn't like "X:\" - if (3 == path.length()) - { + if (3 == path.length()) { right = npos; // skip main block } - else - { + else{ left = right = 3; } } else return 0; // parsing failure } - else if (path.length() >= 1 && sep == path[0]) - { - if (1 == path.length()) // 'bare' backslash - { + else if (path.length() >= 1 && sep == path[0]) { + if (1 == path.length()) { // 'bare' backslash right = npos; // skip main block } - else - { - if (sep == path[1]) // is it UNC? - { + else{ + if (sep == path[1]) { // is it UNC? // Find end of machine name right = path.find_first_of(sep, 2); if (npos == right) @@ -102,8 +92,7 @@ WIN32_FIND_DATA fd; // Main parse block - step through path. - while (npos != right) - { + while (npos != right) { left = right; // catch up // Find next separator. @@ -130,8 +119,7 @@ path.replace(left, old_len, fd.cFileName, new_len); // More to do? - if (npos != right) - { + if (npos != right) { // Yes - move past separator . right = left + new_len + 1; @@ -152,14 +140,14 @@ void systemMessage(const char *title) { - LPVOID lpMsgBuf; - FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - ::GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPTSTR) &lpMsgBuf, - 0, - NULL );// Process any inserts in lpMsgBuf. - MessageBox( NULL, (LPTSTR)lpMsgBuf, title, MB_OK | MB_ICONSTOP); + LPVOID lpMsgBuf; + FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ::GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPTSTR) &lpMsgBuf, + 0, + NULL ); // Process any inserts in lpMsgBuf. + MessageBox( NULL, (LPTSTR)lpMsgBuf, title, MB_OK | MB_ICONSTOP); }
--- a/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/ToolBar.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UniversalIndentGUI_NPP/NPPCommon/Ccpp/ToolBar.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -23,275 +23,253 @@ const bool ToolBar::ENLARGED = false; const int WS_TOOLBARSTYLE = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_TOP; -bool ToolBar::init(HINSTANCE hInst, HWND hPere, int iconSize, - ToolBarButtonUnit *buttonUnitArray, int arraySize, - bool doUglyStandardIcon, int *bmpArray, int bmpArraySize) +bool ToolBar::init(HINSTANCE hInst, HWND hPere, int iconSize, + ToolBarButtonUnit *buttonUnitArray, int arraySize, + bool doUglyStandardIcon, int *bmpArray, int bmpArraySize) { - Window::init(hInst, hPere); - _state = doUglyStandardIcon?TB_STANDARD:(iconSize >= 32?TB_LARGE:TB_SMALL); - _bmpArray = bmpArray; - _bmpArraySize = bmpArraySize; + Window::init(hInst, hPere); + _state = doUglyStandardIcon ? TB_STANDARD : (iconSize >= 32 ? TB_LARGE : TB_SMALL); + _bmpArray = bmpArray; + _bmpArraySize = bmpArraySize; + + _toolBarIcons.init(buttonUnitArray, arraySize); + _toolBarIcons.create(_hInst, iconSize); - _toolBarIcons.init(buttonUnitArray, arraySize); - _toolBarIcons.create(_hInst, iconSize); - - INITCOMMONCONTROLSEX icex; - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_WIN95_CLASSES|ICC_COOL_CLASSES|ICC_BAR_CLASSES|ICC_USEREX_CLASSES; - InitCommonControlsEx(&icex); + INITCOMMONCONTROLSEX icex; + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_WIN95_CLASSES|ICC_COOL_CLASSES|ICC_BAR_CLASSES|ICC_USEREX_CLASSES; + InitCommonControlsEx(&icex); - _hSelf = ::CreateWindowEx( - WS_EX_PALETTEWINDOW, - TOOLBARCLASSNAME, - "", - WS_TOOLBARSTYLE, - 0, 0, - 0, 0, - _hParent, - NULL, - _hInst, - 0); + _hSelf = ::CreateWindowEx( + WS_EX_PALETTEWINDOW, + TOOLBARCLASSNAME, + "", + WS_TOOLBARSTYLE, + 0, 0, + 0, 0, + _hParent, + NULL, + _hInst, + 0); - if (!_hSelf) - { - systemMessage("System Err"); - throw int(9); - } + if (!_hSelf) { + systemMessage("System Err"); + throw int(9); + } + + // Send the TB_BUTTONSTRUCTSIZE message, which is required for + // backward compatibility. + ::SendMessage(_hSelf, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); + + /* set ext size to show button down */ + LONG exStyle = (LONG) ::SendMessage(_hSelf, TB_GETEXTENDEDSTYLE, 0, 0); + ::SendMessage(_hSelf, TB_SETEXTENDEDSTYLE, 0, exStyle | TBSTYLE_EX_DRAWDDARROWS); - // Send the TB_BUTTONSTRUCTSIZE message, which is required for - // backward compatibility. - ::SendMessage(_hSelf, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); - - /* set ext size to show button down */ - LONG exStyle = (LONG)::SendMessage(_hSelf, TB_GETEXTENDEDSTYLE, 0, 0); - ::SendMessage(_hSelf, TB_SETEXTENDEDSTYLE, 0, exStyle | TBSTYLE_EX_DRAWDDARROWS); + if (!doUglyStandardIcon) { + setDefaultImageList(); + setHotImageList(); + setDisableImageList(); + } + else{ + ::SendMessage(_hSelf, TB_LOADIMAGES, IDB_STD_SMALL_COLOR, reinterpret_cast<LPARAM>(HINST_COMMCTRL)); - if (!doUglyStandardIcon) - { - setDefaultImageList(); - setHotImageList(); - setDisableImageList(); - } - else - { - ::SendMessage(_hSelf, TB_LOADIMAGES, IDB_STD_SMALL_COLOR, reinterpret_cast<LPARAM>(HINST_COMMCTRL)); + TBADDBITMAP addbmp = {_hInst, 0}; + if (bmpArray) { + for (int i = 0 ; i < _bmpArraySize ; i++) { + addbmp.nID = _bmpArray[i]; + ::SendMessage(_hSelf, TB_ADDBITMAP, 1, (LPARAM)&addbmp); + } + } + } + int nbElement = _toolBarIcons.getNbCommand(); - TBADDBITMAP addbmp = {_hInst, 0}; - if (bmpArray) - { - for (int i = 0 ; i < _bmpArraySize ; i++) - { - addbmp.nID = _bmpArray[i]; - ::SendMessage(_hSelf, TB_ADDBITMAP, 1, (LPARAM)&addbmp); - } - } - - } - int nbElement = _toolBarIcons.getNbCommand(); - - _pTBB = new TBBUTTON[nbElement]; - int inc = 1; + _pTBB = new TBBUTTON[nbElement]; + int inc = 1; + + for (int i = 0, j = 0; i < nbElement ; i++) { + int cmd = 0; + int bmpIndex, style; - for (int i = 0, j = 0; i < nbElement ; i++) - { - int cmd = 0; - int bmpIndex, style; + if ((cmd = _toolBarIcons.getCommandAt(i)) != 0) { + if (doUglyStandardIcon) { + int ibmp = _toolBarIcons.getUglyIconAt(i); + bmpIndex = (ibmp == -1) ? (STD_PRINT + (inc++)) : ibmp; + } + else + bmpIndex = j++; - if ((cmd = _toolBarIcons.getCommandAt(i)) != 0) - { - if (doUglyStandardIcon) - { - int ibmp = _toolBarIcons.getUglyIconAt(i); - bmpIndex = (ibmp == -1)?(STD_PRINT + (inc++)):ibmp; - } - else - bmpIndex = j++; + style = TBSTYLE_BUTTON | _toolBarIcons.getIconStyle(i); + } + else{ + bmpIndex = 0; + style = TBSTYLE_SEP; + } + _pTBB[i].iBitmap = bmpIndex; + _pTBB[i].idCommand = cmd; + _pTBB[i].fsState = TBSTATE_ENABLED; + _pTBB[i].fsStyle = style; + _pTBB[i].dwData = 0; + _pTBB[i].iString = 0; + } - style = TBSTYLE_BUTTON | _toolBarIcons.getIconStyle(i); - } - else - { - bmpIndex = 0; - style = TBSTYLE_SEP; - } - _pTBB[i].iBitmap = bmpIndex; - _pTBB[i].idCommand = cmd; - _pTBB[i].fsState = TBSTATE_ENABLED; - _pTBB[i].fsStyle = style; - _pTBB[i].dwData = 0; - _pTBB[i].iString = 0; + setButtonSize(iconSize, iconSize); + ::SendMessage(_hSelf, TB_ADDBUTTONS, (WPARAM)nbElement, (LPARAM)_pTBB); + ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); - } - - setButtonSize(iconSize, iconSize); - ::SendMessage(_hSelf, TB_ADDBUTTONS, (WPARAM)nbElement, (LPARAM)_pTBB); - ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); - - return true; + return true; } -void ToolBar::reset() +void ToolBar::reset() { - setDefaultImageList(); - setHotImageList(); - setDisableImageList(); - - /* set ext size to show button down */ - LONG exStyle = (LONG)::SendMessage(_hSelf, TB_GETEXTENDEDSTYLE, 0, 0); - ::SendMessage(_hSelf, TB_SETEXTENDEDSTYLE, 0, exStyle | TBSTYLE_EX_DRAWDDARROWS); + setDefaultImageList(); + setHotImageList(); + setDisableImageList(); - if (_state == TB_STANDARD) - { - int nbElement = _toolBarIcons.getNbCommand(); - for (int i = 0, j = 0, k = nbElement-1 ; i < nbElement ; i++, k--) - { - int cmd = 0; - int bmpIndex, style; + /* set ext size to show button down */ + LONG exStyle = (LONG) ::SendMessage(_hSelf, TB_GETEXTENDEDSTYLE, 0, 0); + ::SendMessage(_hSelf, TB_SETEXTENDEDSTYLE, 0, exStyle | TBSTYLE_EX_DRAWDDARROWS); - ::SendMessage(_hSelf, TB_DELETEBUTTON, k, 0); + if (_state == TB_STANDARD) { + int nbElement = _toolBarIcons.getNbCommand(); + for (int i = 0, j = 0, k = nbElement-1 ; i < nbElement ; i++, k--) { + int cmd = 0; + int bmpIndex, style; + + ::SendMessage(_hSelf, TB_DELETEBUTTON, k, 0); - if ((cmd = _toolBarIcons.getCommandAt(i)) != 0) - { - bmpIndex = j++; - style = TBSTYLE_BUTTON | _toolBarIcons.getIconStyle(i); - } - else - { - bmpIndex = 0; - style = TBSTYLE_SEP; - } - _pTBB[i].iBitmap = bmpIndex; - _pTBB[i].idCommand = cmd; - _pTBB[i].fsState = TBSTATE_ENABLED; - _pTBB[i].fsStyle = style; - _pTBB[i].dwData = 0; - _pTBB[i].iString = 0; + if ((cmd = _toolBarIcons.getCommandAt(i)) != 0) { + bmpIndex = j++; + style = TBSTYLE_BUTTON | _toolBarIcons.getIconStyle(i); + } + else{ + bmpIndex = 0; + style = TBSTYLE_SEP; + } + _pTBB[i].iBitmap = bmpIndex; + _pTBB[i].idCommand = cmd; + _pTBB[i].fsState = TBSTATE_ENABLED; + _pTBB[i].fsStyle = style; + _pTBB[i].dwData = 0; + _pTBB[i].iString = 0; + } - } + ::SendMessage(_hSelf, TB_ADDBUTTONS, (WPARAM)nbElement, (LPARAM)_pTBB); + } - ::SendMessage(_hSelf, TB_ADDBUTTONS, (WPARAM)nbElement, (LPARAM)_pTBB); - } - - ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); + ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); } -void ToolBar::setToUglyIcons() +void ToolBar::setToUglyIcons() { - if (_state == TB_STANDARD) - return; + if (_state == TB_STANDARD) + return; - // Due to the drawback of toolbar control (in-coexistence of Imagelist - custom icons and Bitmap - Std icons), - // We have to destroy the control then re-initialize it - ::DestroyWindow(_hSelf); + // Due to the drawback of toolbar control (in-coexistence of Imagelist - custom icons and Bitmap - Std icons), + // We have to destroy the control then re-initialize it + ::DestroyWindow(_hSelf); - //_state = REDUCED; + //_state = REDUCED; - _hSelf = ::CreateWindowEx( - WS_EX_PALETTEWINDOW , - TOOLBARCLASSNAME, - "", - WS_TOOLBARSTYLE|TBSTYLE_WRAPABLE, - 0, 0, - 0, 0, - _hParent, - NULL, - _hInst, - 0); + _hSelf = ::CreateWindowEx( + WS_EX_PALETTEWINDOW, + TOOLBARCLASSNAME, + "", + WS_TOOLBARSTYLE|TBSTYLE_WRAPABLE, + 0, 0, + 0, 0, + _hParent, + NULL, + _hInst, + 0); - if (!_hSelf) - { - systemMessage("System Err"); - throw int(9); - } + if (!_hSelf) { + systemMessage("System Err"); + throw int(9); + } - // Send the TB_BUTTONSTRUCTSIZE message, which is required for - // backward compatibility. - ::SendMessage(_hSelf, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); + // Send the TB_BUTTONSTRUCTSIZE message, which is required for + // backward compatibility. + ::SendMessage(_hSelf, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0); - ::SendMessage(_hSelf, TB_LOADIMAGES, IDB_STD_SMALL_COLOR, reinterpret_cast<LPARAM>(HINST_COMMCTRL)); + ::SendMessage(_hSelf, TB_LOADIMAGES, IDB_STD_SMALL_COLOR, reinterpret_cast<LPARAM>(HINST_COMMCTRL)); - /* set ext size to show button down */ - LONG exStyle = (LONG)::SendMessage(_hSelf, TB_GETEXTENDEDSTYLE, 0, 0); - ::SendMessage(_hSelf, TB_SETEXTENDEDSTYLE, 0, exStyle | TBSTYLE_EX_DRAWDDARROWS); + /* set ext size to show button down */ + LONG exStyle = (LONG) ::SendMessage(_hSelf, TB_GETEXTENDEDSTYLE, 0, 0); + ::SendMessage(_hSelf, TB_SETEXTENDEDSTYLE, 0, exStyle | TBSTYLE_EX_DRAWDDARROWS); - TBADDBITMAP addbmp = {_hInst, 0}; - if (_bmpArray) - { - for (int i = 0 ; i < _bmpArraySize ; i++) - { - addbmp.nID = _bmpArray[i]; - ::SendMessage(_hSelf, TB_ADDBITMAP, 1, (LPARAM)&addbmp); - } - } + TBADDBITMAP addbmp = {_hInst, 0}; + if (_bmpArray) { + for (int i = 0 ; i < _bmpArraySize ; i++) { + addbmp.nID = _bmpArray[i]; + ::SendMessage(_hSelf, TB_ADDBITMAP, 1, (LPARAM)&addbmp); + } + } - int nbElement = _toolBarIcons.getNbCommand(); - int inc = 1; + int nbElement = _toolBarIcons.getNbCommand(); + int inc = 1; - for (int i = 0 ; i < nbElement ; i++) - { - int cmd = 0; - int bmpIndex, style; + for (int i = 0 ; i < nbElement ; i++) { + int cmd = 0; + int bmpIndex, style; - if ((cmd = _toolBarIcons.getCommandAt(i)) != 0) - { - int ibmp = _toolBarIcons.getUglyIconAt(i); - bmpIndex = (ibmp == -1)?(STD_PRINT + (inc++)):ibmp; - style = TBSTYLE_BUTTON; - } - else - { - bmpIndex = 0; - style = TBSTYLE_SEP; - } - _pTBB[i].iBitmap = bmpIndex; - _pTBB[i].idCommand = cmd; - _pTBB[i].fsState = TBSTATE_ENABLED; - _pTBB[i].fsStyle = style; - _pTBB[i].dwData = 0; - _pTBB[i].iString = 0; + if ((cmd = _toolBarIcons.getCommandAt(i)) != 0) { + int ibmp = _toolBarIcons.getUglyIconAt(i); + bmpIndex = (ibmp == -1) ? (STD_PRINT + (inc++)) : ibmp; + style = TBSTYLE_BUTTON; + } + else{ + bmpIndex = 0; + style = TBSTYLE_SEP; + } + _pTBB[i].iBitmap = bmpIndex; + _pTBB[i].idCommand = cmd; + _pTBB[i].fsState = TBSTATE_ENABLED; + _pTBB[i].fsStyle = style; + _pTBB[i].dwData = 0; + _pTBB[i].iString = 0; + } - } - - setButtonSize(16, 16); + setButtonSize(16, 16); - ::SendMessage(_hSelf, TB_ADDBUTTONS, (WPARAM)nbElement, (LPARAM)_pTBB); - ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); - _state = TB_STANDARD; + ::SendMessage(_hSelf, TB_ADDBUTTONS, (WPARAM)nbElement, (LPARAM)_pTBB); + ::SendMessage(_hSelf, TB_AUTOSIZE, 0, 0); + _state = TB_STANDARD; } void ReBar::init(HINSTANCE hInst, HWND hPere, ToolBar *pToolBar) { - Window::init(hInst, hPere); - _pToolBar = pToolBar; - _hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, - REBARCLASSNAME, - NULL, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS| - WS_CLIPCHILDREN|CCS_NODIVIDER, - 0,0,0,0, _hParent, NULL, _hInst, NULL); + Window::init(hInst, hPere); + _pToolBar = pToolBar; + _hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, + REBARCLASSNAME, + NULL, + WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS| + WS_CLIPCHILDREN|CCS_NODIVIDER, + 0,0,0,0, _hParent, NULL, _hInst, NULL); - ::SendMessage(_hSelf, RB_SETBARINFO, 0, (LPARAM)&_rbi); + ::SendMessage(_hSelf, RB_SETBARINFO, 0, (LPARAM)&_rbi); - RECT rc; - ::GetWindowRect(hPere, &rc); + RECT rc; + ::GetWindowRect(hPere, &rc); - int dwBtnSize = (int)::SendMessage(_pToolBar->getHSelf(), TB_GETBUTTONSIZE, 0,0); - int iSize = rc.right - rc.left; + int dwBtnSize = (int)::SendMessage(_pToolBar->getHSelf(), TB_GETBUTTONSIZE, 0,0); + int iSize = rc.right - rc.left; - _rbBand.hwndChild = _pToolBar->getHSelf(); + _rbBand.hwndChild = _pToolBar->getHSelf(); - if (LOWORD(dwBtnSize) < iSize) { - _rbBand.cxMinChild = LOWORD(dwBtnSize) * _pToolBar->getCountOfTBIcons(); - _rbBand.cyMinChild = HIWORD(dwBtnSize) * _pToolBar->getTBLines(); - _rbBand.cx = iSize; - } else { - _rbBand.cxMinChild = LOWORD(dwBtnSize); - _rbBand.cyMinChild = (rc.bottom - rc.top) - 4; - _rbBand.cx = LOWORD(dwBtnSize); - } + if (LOWORD(dwBtnSize) < iSize) { + _rbBand.cxMinChild = LOWORD(dwBtnSize) * _pToolBar->getCountOfTBIcons(); + _rbBand.cyMinChild = HIWORD(dwBtnSize) * _pToolBar->getTBLines(); + _rbBand.cx = iSize; + } + else { + _rbBand.cxMinChild = LOWORD(dwBtnSize); + _rbBand.cyMinChild = (rc.bottom - rc.top) - 4; + _rbBand.cx = LOWORD(dwBtnSize); + } - ::SendMessage(_hSelf, RB_INSERTBAND, (WPARAM)0, (LPARAM)&_rbBand); + ::SendMessage(_hSelf, RB_INSERTBAND, (WPARAM)0, (LPARAM)&_rbBand); }
--- a/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPP.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -24,32 +24,32 @@ /* information for notepad */ -CONST INT nbFunc = 3; -CONST CHAR PLUGIN_NAME[] = "&UniversalIndentGUI"; +CONST INT nbFunc = 3; +CONST CHAR PLUGIN_NAME[] = "&UniversalIndentGUI"; /* global values */ -HANDLE g_hModule = NULL; -NppData nppData; -FuncItem funcItem[nbFunc]; -toolbarIcons g_TBWndMgr; +HANDLE g_hModule = NULL; +NppData nppData; +FuncItem funcItem[nbFunc]; +toolbarIcons g_TBWndMgr; IndentHandler *indentHandler; /* settings */ -TCHAR configPath[MAX_PATH]; -TCHAR iniFilePath[MAX_PATH]; -tPluginProp pluginProp; +TCHAR configPath[MAX_PATH]; +TCHAR iniFilePath[MAX_PATH]; +tPluginProp pluginProp; /* main function of dll */ BOOL APIENTRY DllMain( HANDLE hModule, DWORD reasonForCall, LPVOID lpReserved ) { - g_hModule = hModule; + g_hModule = hModule; - switch (reasonForCall) - { - case DLL_PROCESS_ATTACH: - { + switch (reasonForCall) + { + case DLL_PROCESS_ATTACH: + { if (!qApp) { int argc = 1; char *argv[] = {"setup", NULL}; @@ -62,69 +62,69 @@ indentHandler->setWindowClosedCallback( showUiGUI ); } - /* Set function pointers */ - funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pFunc = showUiGUI; - funcItem[EXECUTE_TEXT_INDENT_INDEX]._pFunc = indentText; + /* Set function pointers */ + funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pFunc = showUiGUI; + funcItem[EXECUTE_TEXT_INDENT_INDEX]._pFunc = indentText; funcItem[TOGGLE_AUTO_UPDATE_INDEX]._pFunc = toggleAutoUpdate; - - /* Fill menu names */ - strcpy(funcItem[TOGGLE_SHOW_UIGUI_INDEX]._itemName, "&Show Parameter Settings"); + + /* Fill menu names */ + strcpy(funcItem[TOGGLE_SHOW_UIGUI_INDEX]._itemName, "&Show Parameter Settings"); strcpy(funcItem[EXECUTE_TEXT_INDENT_INDEX]._itemName, "&Indent text"); strcpy(funcItem[TOGGLE_AUTO_UPDATE_INDEX]._itemName, "&Enable Text Auto Update"); - /* Set shortcuts */ - funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey = new ShortcutKey; - funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_isAlt = true; - funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_isCtrl = true; - funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_isShift = true; - funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_key = 'T'; + /* Set shortcuts */ + funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey = new ShortcutKey; + funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_isAlt = true; + funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_isCtrl = true; + funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_isShift = true; + funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey->_key = 'T'; funcItem[EXECUTE_TEXT_INDENT_INDEX]._pShKey = NULL; funcItem[TOGGLE_AUTO_UPDATE_INDEX]._pShKey = NULL; - break; - } - case DLL_PROCESS_DETACH: - { - delete funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey; + break; + } + case DLL_PROCESS_DETACH: + { + delete funcItem[TOGGLE_SHOW_UIGUI_INDEX]._pShKey; delete indentHandler; - /* save settings */ - saveSettings(); - break; - } - case DLL_THREAD_ATTACH: - break; - - case DLL_THREAD_DETACH: - break; - } + /* save settings */ + saveSettings(); + break; + } + case DLL_THREAD_ATTACH: + break; - return TRUE; + case DLL_THREAD_DETACH: + break; + } + + return TRUE; } extern "C" __declspec(dllexport) void setInfo(NppData notpadPlusData) { - /* stores notepad data */ - nppData = notpadPlusData; + /* stores notepad data */ + nppData = notpadPlusData; - /* load data of plugin */ - loadSettings(); + /* load data of plugin */ + loadSettings(); - /* initial dialogs */ - //universalIndentGUI_NPPDialog.init((HINSTANCE)g_hModule, nppData, &pluginProp); + /* initial dialogs */ + //universalIndentGUI_NPPDialog.init((HINSTANCE)g_hModule, nppData, &pluginProp); } extern "C" __declspec(dllexport) LPCSTR getName() { - return PLUGIN_NAME; + return PLUGIN_NAME; } extern "C" __declspec(dllexport) FuncItem * getFuncsArray(INT *nbF) { - *nbF = nbFunc; - return funcItem; + *nbF = nbFunc; + return funcItem; } @@ -135,15 +135,13 @@ */ extern "C" __declspec(dllexport) void beNotified(SCNotification *notifyCode) { - if (notifyCode->nmhdr.hwndFrom == nppData._nppHandle) - { - /* on this notification code you can register your plugin icon in Notepad++ toolbar */ - if (notifyCode->nmhdr.code == NPPN_TBMODIFICATION) - { - //g_TBWndMgr.hToolbarBmp = (HBITMAP)::LoadImage((HINSTANCE)g_hModule, MAKEINTRESOURCE(IDB_TOOLBAR), IMAGE_BITMAP, 0, 0, (LR_LOADMAP3DCOLORS)); - //::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON, (WPARAM)funcItem[TOGGLE_AUTO_UPDATE_INDEX]._cmdID, (LPARAM)&g_TBWndMgr); - } - } + if (notifyCode->nmhdr.hwndFrom == nppData._nppHandle) { + /* on this notification code you can register your plugin icon in Notepad++ toolbar */ + if (notifyCode->nmhdr.code == NPPN_TBMODIFICATION) { + //g_TBWndMgr.hToolbarBmp = (HBITMAP)::LoadImage((HINSTANCE)g_hModule, MAKEINTRESOURCE(IDB_TOOLBAR), IMAGE_BITMAP, 0, 0, (LR_LOADMAP3DCOLORS)); + //::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON, (WPARAM)funcItem[TOGGLE_AUTO_UPDATE_INDEX]._cmdID, (LPARAM)&g_TBWndMgr); + } + } } @@ -154,7 +152,7 @@ */ extern "C" __declspec(dllexport) LRESULT messageProc(UINT Message, WPARAM wParam, LPARAM lParam) { - return TRUE; + return TRUE; } @@ -165,23 +163,22 @@ */ void loadSettings(void) { - /* initialize the config directory */ - ::SendMessage(nppData._nppHandle, NPPM_GETPLUGINSCONFIGDIR, MAX_PATH, (LPARAM)configPath); + /* initialize the config directory */ + ::SendMessage(nppData._nppHandle, NPPM_GETPLUGINSCONFIGDIR, MAX_PATH, (LPARAM)configPath); - /* Test if config path exist */ - if (PathFileExists(configPath) == FALSE) { - ::CreateDirectory(configPath, NULL); - } + /* Test if config path exist */ + if (PathFileExists(configPath) == FALSE) { + ::CreateDirectory(configPath, NULL); + } - strcpy(iniFilePath, configPath); - strcat(iniFilePath, PLUGINTEMP_INI); - if (PathFileExists(iniFilePath) == FALSE) - { - ::CloseHandle(::CreateFile(iniFilePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL)); - } + strcpy(iniFilePath, configPath); + strcat(iniFilePath, PLUGINTEMP_INI); + if (PathFileExists(iniFilePath) == FALSE) { + ::CloseHandle(::CreateFile(iniFilePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL)); + } - pluginProp.iValue1 = ::GetPrivateProfileInt(dlgTemp, Value1, 200, iniFilePath); - pluginProp.iValue2 = ::GetPrivateProfileInt(dlgTemp, Value2, 200, iniFilePath); + pluginProp.iValue1 = ::GetPrivateProfileInt(dlgTemp, Value1, 200, iniFilePath); + pluginProp.iValue2 = ::GetPrivateProfileInt(dlgTemp, Value2, 200, iniFilePath); } @@ -192,10 +189,10 @@ */ void saveSettings(void) { - TCHAR temp[16]; + TCHAR temp[16]; - ::WritePrivateProfileString(dlgTemp, Value1, _itoa(pluginProp.iValue1, temp, 10), iniFilePath); - ::WritePrivateProfileString(dlgTemp, Value2, _itoa(pluginProp.iValue2, temp, 10), iniFilePath); + ::WritePrivateProfileString(dlgTemp, Value1, _itoa(pluginProp.iValue1, temp, 10), iniFilePath); + ::WritePrivateProfileString(dlgTemp, Value2, _itoa(pluginProp.iValue2, temp, 10), iniFilePath); } @@ -204,7 +201,7 @@ */ void toggleAutoUpdate(void) { - HMENU hMenu = ::GetMenu(nppData._nppHandle); + HMENU hMenu = ::GetMenu(nppData._nppHandle); UINT state = ::GetMenuState(hMenu, funcItem[TOGGLE_AUTO_UPDATE_INDEX]._cmdID, MF_BYCOMMAND); if ( state & MF_CHECKED ) { @@ -213,7 +210,7 @@ } else { if ( !indentHandler->isVisible() ) { - showUiGUI(); + showUiGUI(); } indentHandler->setParameterChangedCallback( indentText ); state = ::CheckMenuItem(hMenu, funcItem[TOGGLE_AUTO_UPDATE_INDEX]._cmdID, MF_BYCOMMAND | MF_CHECKED); @@ -225,30 +222,28 @@ void showUiGUI(void) { - HMENU hMenu = ::GetMenu(nppData._nppHandle); + HMENU hMenu = ::GetMenu(nppData._nppHandle); UINT menuState = ::GetMenuState(hMenu, funcItem[TOGGLE_SHOW_UIGUI_INDEX]._cmdID, MF_BYCOMMAND); bool windowIsVisible = indentHandler->isVisible(); if ( menuState & MF_CHECKED ) { - if ( windowIsVisible ) { - indentHandler->hide(); + indentHandler->hide(); } menuState = ::CheckMenuItem(hMenu, funcItem[TOGGLE_SHOW_UIGUI_INDEX]._cmdID, MF_BYCOMMAND | MF_UNCHECKED); } else { if ( !windowIsVisible ) { - indentHandler->show(); + indentHandler->show(); } menuState = ::CheckMenuItem(hMenu, funcItem[TOGGLE_SHOW_UIGUI_INDEX]._cmdID, MF_BYCOMMAND | MF_CHECKED); } - } HWND getCurrentHScintilla(int which) { - return (which == 0)?nppData._scintillaMainHandle:nppData._scintillaSecondHandle; + return (which == 0) ? nppData._scintillaMainHandle : nppData._scintillaSecondHandle; }; @@ -265,7 +260,6 @@ // No text has been selected to format the whole text. if ( textLength - 1 == 0 ) { - textLength = ::SendMessage(getCurrentHScintilla(currentEdit), SCI_GETTEXTLENGTH, 0, 0); // Because we need space for a trailing 0 byte increment the length. textLength++;
--- a/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPPDialog.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/UniversalIndentGUI_NPP/UniversalIndentGUI_NPPDialog.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -27,23 +27,23 @@ /* messages needs to be added in resource.h */ static ToolBarButtonUnit toolBarIcons[] = { - {IDM_EX_UNDO, -1, -1, -1, -1, 0/* TBSTYLE_DROPDOWN */}, - {IDM_EX_REDO, -1, -1, -1, -1, 0/* TBSTYLE_DROPDOWN */} + {IDM_EX_UNDO, -1, -1, -1, -1, 0 /* TBSTYLE_DROPDOWN */}, + {IDM_EX_REDO, -1, -1, -1, -1, 0 /* TBSTYLE_DROPDOWN */} }; - + static int stdIcons[] = {IDB_EX_UNDO, IDB_EX_REDO}; -/** +/** * Note: On change, keep sure to change order of IDM_EX_... also in function GetNameStrFromCmd */ static LPTSTR szToolTip[5] = { - "Undo", - "Redo" + "Undo", + "Redo" }; void UniversalIndentGUI_NPPDialog::GetNameStrFromCmd(UINT resID, LPTSTR tip) { - strcpy(tip, szToolTip[resID - IDM_EX_UNDO]); + strcpy(tip, szToolTip[resID - IDM_EX_UNDO]); } /**************************** end of toolbar layout ****************************/ @@ -62,158 +62,152 @@ void UniversalIndentGUI_NPPDialog::init(HINSTANCE hInst, NppData nppData, tPluginProp *pPluginProp) { - _nppData = nppData; - _pPluginProp = pPluginProp; - DockingDlgInterface::init(hInst, nppData._nppHandle); + _nppData = nppData; + _pPluginProp = pPluginProp; + DockingDlgInterface::init(hInst, nppData._nppHandle); } void UniversalIndentGUI_NPPDialog::doDialog(bool willBeShown) { - if (!isCreated()) - { - create(&_data); + if (!isCreated()) { + create(&_data); - // define the default docking behaviour - _data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB; - _data.hIconTab = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_TABBAR), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); - _data.pszModuleName = getPluginFileName(); - _data.dlgID = TOGGLE_DOCKABLE_WINDOW_INDEX; - ::SendMessage(_hParent, NPPM_DMMREGASDCKDLG, 0, (LPARAM)&_data); - } - display(willBeShown); + // define the default docking behaviour + _data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB; + _data.hIconTab = (HICON) ::LoadImage(_hInst, MAKEINTRESOURCE(IDI_TABBAR), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); + _data.pszModuleName = getPluginFileName(); + _data.dlgID = TOGGLE_DOCKABLE_WINDOW_INDEX; + ::SendMessage(_hParent, NPPM_DMMREGASDCKDLG, 0, (LPARAM)&_data); + } + display(willBeShown); } BOOL CALLBACK UniversalIndentGUI_NPPDialog::run_dlgProc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam) { - switch (Message) - { - case WM_INITDIALOG: - { - InitialDialog(); - break; - } - case WM_SIZE: - case WM_MOVE: - { - RECT rc = {0}; + switch (Message) + { + case WM_INITDIALOG: + { + InitialDialog(); + break; + } + case WM_SIZE: + case WM_MOVE: + { + RECT rc = {0}; - /* test if in side or if docked on top or bottom */ - if ((_iDockedPos == CONT_LEFT) || (_iDockedPos == CONT_RIGHT)) - { - getClientRect(rc); + /* test if in side or if docked on top or bottom */ + if ((_iDockedPos == CONT_LEFT) || (_iDockedPos == CONT_RIGHT)) { + getClientRect(rc); - /* set position of toolbar */ - _ToolBar.reSizeTo(rc); - _Rebar.reSizeTo(rc); + /* set position of toolbar */ + _ToolBar.reSizeTo(rc); + _Rebar.reSizeTo(rc); - /* set position of edit control */ - rc.top += 26; - rc.bottom -= 26; - ::SetWindowPos(_hEdit, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); - } - else - { - getClientRect(rc); - rc.right = rc.left + 23; - - /* set position of toolbar */ - _ToolBar.reSizeTo(rc); - _Rebar.reSizeTo(rc); + /* set position of edit control */ + rc.top += 26; + rc.bottom -= 26; + ::SetWindowPos(_hEdit, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); + } + else{ + getClientRect(rc); + rc.right = rc.left + 23; + + /* set position of toolbar */ + _ToolBar.reSizeTo(rc); + _Rebar.reSizeTo(rc); - /* set position of edit control */ - getClientRect(rc); - rc.left += 23; - rc.right -= 23; - ::SetWindowPos(_hEdit, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); - } - break; - } - case WM_COMMAND: - { - if ((HWND)lParam == _ToolBar.getHSelf()) - { - tb_cmd(LOWORD(wParam)); - return TRUE; - } - break; - } - case WM_NOTIFY: - { - LPNMHDR nmhdr = (LPNMHDR)lParam; + /* set position of edit control */ + getClientRect(rc); + rc.left += 23; + rc.right -= 23; + ::SetWindowPos(_hEdit, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); + } + break; + } + case WM_COMMAND: + { + if ((HWND)lParam == _ToolBar.getHSelf()) { + tb_cmd(LOWORD(wParam)); + return TRUE; + } + break; + } + case WM_NOTIFY: + { + LPNMHDR nmhdr = (LPNMHDR)lParam; - if (nmhdr->hwndFrom == _hEdit) { - - /* do what ever you need */ + if (nmhdr->hwndFrom == _hEdit) { + /* do what ever you need */ + } + else if (nmhdr->code == TTN_GETDISPINFO) { + /* tooltip request of toolbar */ - } else if (nmhdr->code == TTN_GETDISPINFO) { - - /* tooltip request of toolbar */ - - LPTOOLTIPTEXT lpttt; + LPTOOLTIPTEXT lpttt; - lpttt = (LPTOOLTIPTEXT)nmhdr; - lpttt->hinst = _hInst; + lpttt = (LPTOOLTIPTEXT)nmhdr; + lpttt->hinst = _hInst; - // Specify the resource identifier of the descriptive - // text for the given button. - int resId = int(lpttt->hdr.idFrom); + // Specify the resource identifier of the descriptive + // text for the given button. + int resId = int(lpttt->hdr.idFrom); - TCHAR tip[16]; - GetNameStrFromCmd(resId, tip); - lpttt->lpszText = tip; - return TRUE; - } else { - - /* parse all other notifications to docking dialog interface */ + TCHAR tip[16]; + GetNameStrFromCmd(resId, tip); + lpttt->lpszText = tip; + return TRUE; + } + else { + /* parse all other notifications to docking dialog interface */ - return DockingDlgInterface::run_dlgProc(hWnd, Message, wParam, lParam); - } - break; - } - case WM_DESTROY: - { - /* destroy icon of tab */ + return DockingDlgInterface::run_dlgProc(hWnd, Message, wParam, lParam); + } + break; + } + case WM_DESTROY: + { + /* destroy icon of tab */ ::DestroyIcon(_data.hIconTab); - break; - } - default: - return DockingDlgInterface::run_dlgProc(hWnd, Message, wParam, lParam); - } + break; + } + default: + return DockingDlgInterface::run_dlgProc(hWnd, Message, wParam, lParam); + } - return FALSE; + return FALSE; } void UniversalIndentGUI_NPPDialog::InitialDialog(void) { - /* get handle of dialogs */ - _hEdit = ::GetDlgItem(_hSelf, IDC_EDIT_TEMP); + /* get handle of dialogs */ + _hEdit = ::GetDlgItem(_hSelf, IDC_EDIT_TEMP); - /* create toolbar */ - _ToolBar.init(_hInst, _hSelf, 16, toolBarIcons, sizeof(toolBarIcons)/sizeof(ToolBarButtonUnit), true, stdIcons, sizeof(stdIcons)/sizeof(int)); - _ToolBar.display(); - _Rebar.init(_hInst, _hSelf, &_ToolBar); - _Rebar.display(); + /* create toolbar */ + _ToolBar.init(_hInst, _hSelf, 16, toolBarIcons, sizeof(toolBarIcons)/sizeof(ToolBarButtonUnit), true, stdIcons, sizeof(stdIcons)/sizeof(int)); + _ToolBar.display(); + _Rebar.init(_hInst, _hSelf, &_ToolBar); + _Rebar.display(); } void UniversalIndentGUI_NPPDialog::tb_cmd(UINT message) { - switch (message) - { - case IDM_EX_UNDO: - { - ::SendMessage(_hEdit, WM_UNDO, 0, 0); - break; - } - case IDM_EX_REDO: - { - TCHAR pszText[256]; - _stprintf(pszText, "Value1 = %d\r\nValue2 = %d\r\n\r\n", _pPluginProp->iValue1, _pPluginProp->iValue2); - ::SendMessage(_hEdit, WM_SETTEXT, 0, (LPARAM)pszText); - break; - } - default: - break; - } + switch (message) + { + case IDM_EX_UNDO: + { + ::SendMessage(_hEdit, WM_UNDO, 0, 0); + break; + } + case IDM_EX_REDO: + { + TCHAR pszText[256]; + _stprintf(pszText, "Value1 = %d\r\nValue2 = %d\r\n\r\n", _pPluginProp->iValue1, _pPluginProp->iValue2); + ::SendMessage(_hEdit, WM_SETTEXT, 0, (LPARAM)pszText); + break; + } + default: + break; + } }
--- a/src/aboutdialog.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/aboutdialog.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -32,7 +32,7 @@ QDialog(parent, flags) { this->parent = parent; - qApp->setStyleSheet("QTextBrowser{background-color:transparent}"); + qApp->setStyleSheet("QTextBrowser{background-color:transparent}"); setupUi(this); creditsTextBrowser->setStyleSheet("QTextBrowser#creditsTextBrowser{background-color:white}"); @@ -53,22 +53,22 @@ "<p align='center'><a href=\"http://www.hartwork.org/\"><b>Sebastian Pipping</b></a> for helping me bring UiGUI into the Debian repository and other good ideas.</p></br>" "<p align='center'><a href=\"http://korytskyy.lviv.ua/\"><b>Oleksandr</b></a> for Ukrainian and Russian translation.</p></br>" "<p align='center'><b>Erwan "leg"</b> for French translation and the new icon logo.</p></br>" - "<p align='center'>The <a href=\"http://www.scintilla.org/\"><b>Scintilla</b></a> project for their great text editing component.</p></br>" + "<p align='center'>The <a href=\"http://www.scintilla.org/\"><b>Scintilla</b></a> project for their great text editing component.</p></br>" "<p align='center'><a href=\"http://www.riverbankcomputing.co.uk/software/qscintilla/\"><b>Riverbank</b></a> for their Scintlla Qt wrapper QScintilla.</p></br>" "<p align='center'>The <a href=\"http://astyle.sourceforge.net/\"><b>Artistic Style</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://invisible-island.net/bcpp/\"><b>BCPP</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://www.siber.com/sct/tools/cbl-beau.html\"><b>Cobol Beautifier</b></a> project.</p></br>" - "<p align='center'>The <a href=\"http://csstidy.sourceforge.net/\"><b>CSSTidy</b></a> project.</p></br>" + "<p align='center'>The <a href=\"http://csstidy.sourceforge.net/\"><b>CSSTidy</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://www.gnu.org/software/indent/\"><b>GNU Indent</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://sourceforge.net/projects/gcgreatcode/\"><b>GreatCode</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://linux.com.hk/penguin/man/1/hindent.html\"><b>hindent</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://www.digital-mines.com/htb/\"><b>HTB</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://tidy.sourceforge.net/\"><b>HTML Tidy</b></a> project.</p></br>" - "<p align='center'>The <a href=\"http://code.gosu.pl/\"><b>JsDecoder</b></a> project.</p></br>" + "<p align='center'>The <a href=\"http://code.gosu.pl/\"><b>JsDecoder</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://jsppp.sourceforge.net/\"><b>JSPPP</b></a> project.</p></br>" - "<p align='center'>The <a href=\"http://perltidy.sourceforge.net/\"><b>Perltidy</b></a> project.</p></br>" + "<p align='center'>The <a href=\"http://perltidy.sourceforge.net/\"><b>Perltidy</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://beautifyphp.sourceforge.net/\"><b>PHP_Beautifier</b></a> project.</p></br>" - "<p align='center'>The <a href=\"http://www.waterproof.fr/products/phpCodeBeautifier/\"><b>phpCB</b></a> project.</p></br>" + "<p align='center'>The <a href=\"http://www.waterproof.fr/products/phpCodeBeautifier/\"><b>phpCB</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://sourceforge.net/projects/phpstylist/\"><b>PHP Stylist</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://www.arachnoid.com/ruby/rubyBeautifier.html\"><b>Ruby Beautifier</b></a> project.</p></br>" "<p align='center'>The <a href=\"http://raa.ruby-lang.org/project/ruby_formatter/\"><b>Ruby Formatter</b></a> project.</p></br>" @@ -100,7 +100,7 @@ QString versionString = versionTextBrowser->toHtml(); versionString = versionString.arg(version).arg(revision).arg(buildDate); versionTextBrowser->setHtml(versionString); - } + } else { QWidget::changeEvent(event); }
--- a/src/indenthandler.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/indenthandler.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -36,10 +36,10 @@ /*! - \brief Constructor of the indent handler. - - By calling this constructor the indenter to be loaded, can be selected by setting - its \a indenterID, which is the number of found indenter ini files in alphabetic + \brief Constructor of the indent handler. + + By calling this constructor the indenter to be loaded, can be selected by setting + its \a indenterID, which is the number of found indenter ini files in alphabetic order starting at index 0. */ IndentHandler::IndentHandler(int indenterID, QWidget *mainWindow, QWidget *parent) @@ -103,7 +103,7 @@ #ifdef UNIVERSALINDENTGUI_NPP_EXPORTS connect( toolBox, SIGNAL(currentChanged(int)), this, SLOT(repaint()) ); #endif // UNIVERSALINDENTGUI_NPP_EXPORTS - + //toolBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); //toolBox->setMaximumSize(QSize(16777215, 16777215)); // insert the toolbox into the vlayout @@ -234,11 +234,10 @@ to indent an as parameter defined file. */ QString IndentHandler::generateCommandlineCall() { - - QString indenterCompleteCallString; - QString parameterInputFile; - QString parameterOuputFile; - QString parameterParameterFile; + QString indenterCompleteCallString; + QString parameterInputFile; + QString parameterOuputFile; + QString parameterParameterFile; QString replaceInputFileCommand; // Define the placeholder for parameter variables either in batch or bash programming. @@ -251,9 +250,9 @@ // Generate the parameter string that will be saved to the indenters config file. QString parameterString = getParameterString(); - if ( !configFilename.isEmpty() ) { - saveConfigFile( indenterDirctoryStr + "/" + configFilename, parameterString ); - } + if ( !configFilename.isEmpty() ) { + saveConfigFile( indenterDirctoryStr + "/" + configFilename, parameterString ); + } parameterInputFile = " " + inputFileParameter + "\"" + shellParameterPlaceholder + "\""; @@ -266,28 +265,28 @@ } } - // If the config file name is empty it is assumed that all parameters are sent via command line call - if ( configFilename.isEmpty() ) { - parameterParameterFile = " " + parameterString; - } - // else if needed add the parameter to the indenter call string where the config file can be found. - else if (useCfgFileParameter != "none") { - parameterParameterFile = " " + useCfgFileParameter + "\"" + indenterDirctoryStr + "/" + configFilename + "\""; - } + // If the config file name is empty it is assumed that all parameters are sent via command line call + if ( configFilename.isEmpty() ) { + parameterParameterFile = " " + parameterString; + } + // else if needed add the parameter to the indenter call string where the config file can be found. + else if (useCfgFileParameter != "none") { + parameterParameterFile = " " + useCfgFileParameter + "\"" + indenterDirctoryStr + "/" + configFilename + "\""; + } - // Assemble indenter call string for parameters according to the set order. - if ( parameterOrder == "ipo" ) { - indenterCompleteCallString = parameterInputFile + parameterParameterFile + parameterOuputFile; - } - else if ( parameterOrder == "pio" ) { - indenterCompleteCallString = parameterParameterFile + parameterInputFile + parameterOuputFile; - } + // Assemble indenter call string for parameters according to the set order. + if ( parameterOrder == "ipo" ) { + indenterCompleteCallString = parameterInputFile + parameterParameterFile + parameterOuputFile; + } + else if ( parameterOrder == "pio" ) { + indenterCompleteCallString = parameterParameterFile + parameterInputFile + parameterOuputFile; + } else if ( parameterOrder == "poi" ) { - indenterCompleteCallString = parameterParameterFile + parameterOuputFile + parameterInputFile; - } - else { - indenterCompleteCallString = parameterInputFile + parameterOuputFile + parameterParameterFile; - } + indenterCompleteCallString = parameterParameterFile + parameterOuputFile + parameterInputFile; + } + else { + indenterCompleteCallString = parameterInputFile + parameterOuputFile + parameterParameterFile; + } // Generate the indenter call string either for win32 or other systems. #if defined(Q_OS_WIN32) @@ -329,15 +328,15 @@ /*! - \brief Format \a sourceCode by calling the indenter. - - The \a inputFileExtension has to be given as parameter so the called indenter + \brief Format \a sourceCode by calling the indenter. + + The \a inputFileExtension has to be given as parameter so the called indenter can identify the programming language if needed. */ QString IndentHandler::callIndenter(QString sourceCode, QString inputFileExtension) { if ( indenterExecutableSuffix == ".js" ) { return callJavaScriptIndenter(sourceCode); - } + } else { return callExecutableIndenter(sourceCode, inputFileExtension); } @@ -345,9 +344,9 @@ /*! - \brief Format \a sourceCode by calling the interpreted JavaScript code of the indenter. + \brief Format \a sourceCode by calling the interpreted JavaScript code of the indenter. - The \a inputFileExtension has to be given as parameter so the called indenter + The \a inputFileExtension has to be given as parameter so the called indenter can identify the programming language if needed. */ QString IndentHandler::callJavaScriptIndenter(QString sourceCode) { @@ -369,34 +368,34 @@ /*! - \brief Format \a sourceCode by calling the binary executable of the indenter. + \brief Format \a sourceCode by calling the binary executable of the indenter. - The \a inputFileExtension has to be given as parameter so the called indenter + The \a inputFileExtension has to be given as parameter so the called indenter can identify the programming language if needed. */ QString IndentHandler::callExecutableIndenter(QString sourceCode, QString inputFileExtension) { Q_ASSERT_X( !inputFileName.isEmpty(), "callIndenter", "inputFileName is empty" ); // Q_ASSERT_X( !outputFileName.isEmpty(), "callIndenter", "outputFileName is empty" ); Q_ASSERT_X( !indenterFileName.isEmpty(), "callIndenter", "indenterFileName is empty" ); - + if ( indenterFileName.isEmpty() ) { return ""; } - QString formattedSourceCode; - QString indenterCompleteCallString; - QString parameterInputFile; - QString parameterOuputFile; - QString parameterParameterFile; - QProcess indentProcess; - QString processReturnString; + QString formattedSourceCode; + QString indenterCompleteCallString; + QString parameterInputFile; + QString parameterOuputFile; + QString parameterParameterFile; + QProcess indentProcess; + QString processReturnString; // Generate the parameter string that will be saved to the indenters config file QString parameterString = getParameterString(); - if ( !configFilename.isEmpty() ) { - saveConfigFile( tempDirctoryStr + "/" + configFilename, parameterString ); - } + if ( !configFilename.isEmpty() ) { + saveConfigFile( tempDirctoryStr + "/" + configFilename, parameterString ); + } // Only add a dot to file extension if the string is not empty if ( !inputFileExtension.isEmpty() ) { @@ -404,40 +403,40 @@ } // Delete any previously used input src file and create a new input src file. - QFile::remove(tempDirctoryStr + "/" + inputFileName + inputFileExtension); - QFile inputSrcFile(tempDirctoryStr + "/" + inputFileName + inputFileExtension); - parameterInputFile = " " + inputFileParameter + inputFileName + inputFileExtension; + QFile::remove(tempDirctoryStr + "/" + inputFileName + inputFileExtension); + QFile inputSrcFile(tempDirctoryStr + "/" + inputFileName + inputFileExtension); + parameterInputFile = " " + inputFileParameter + inputFileName + inputFileExtension; if ( outputFileParameter != "none" && outputFileParameter != "stdout" ) { parameterOuputFile = " " + outputFileParameter + outputFileName + inputFileExtension; } - // If the config file name is empty it is assumed that all parameters are sent via command line call - if ( configFilename.isEmpty() ) { - parameterParameterFile = " " + parameterString; - } - // if needed add the parameter to the indenter call string where the config file can be found - else if (useCfgFileParameter != "none") { - parameterParameterFile = " " + useCfgFileParameter + "\"" + tempDirctoryStr + "/" + configFilename + "\""; - } + // If the config file name is empty it is assumed that all parameters are sent via command line call + if ( configFilename.isEmpty() ) { + parameterParameterFile = " " + parameterString; + } + // if needed add the parameter to the indenter call string where the config file can be found + else if (useCfgFileParameter != "none") { + parameterParameterFile = " " + useCfgFileParameter + "\"" + tempDirctoryStr + "/" + configFilename + "\""; + } - // Assemble indenter call string for parameters according to the set order. - if ( parameterOrder == "ipo" ) { - indenterCompleteCallString = parameterInputFile + parameterParameterFile + parameterOuputFile; - } - else if ( parameterOrder == "pio" ) { - indenterCompleteCallString = parameterParameterFile + parameterInputFile + parameterOuputFile; - } + // Assemble indenter call string for parameters according to the set order. + if ( parameterOrder == "ipo" ) { + indenterCompleteCallString = parameterInputFile + parameterParameterFile + parameterOuputFile; + } + else if ( parameterOrder == "pio" ) { + indenterCompleteCallString = parameterParameterFile + parameterInputFile + parameterOuputFile; + } else if ( parameterOrder == "poi" ) { - indenterCompleteCallString = parameterParameterFile + parameterOuputFile + parameterInputFile; - } - else { - indenterCompleteCallString = parameterInputFile + parameterOuputFile + parameterParameterFile; - } + indenterCompleteCallString = parameterParameterFile + parameterOuputFile + parameterInputFile; + } + else { + indenterCompleteCallString = parameterInputFile + parameterOuputFile + parameterParameterFile; + } // If no indenter executable call string could be created before, show an error message. if ( indenterExecutableCallString.isEmpty() ) { - errorMessageDialog->showMessage(tr("No indenter executable"), + errorMessageDialog->showMessage(tr("No indenter executable"), tr("There exists no indenter executable with the name \"%1\" in the directory \"%2\" nor in the global environment.").arg(indenterFileName).arg(indenterDirctoryStr) ); return sourceCode; } @@ -465,25 +464,25 @@ processReturnString += tr("<b>Returned error message:</b> ") + indentProcess.errorString() + "<br>"; switch ( indentProcess.error() ) { - case QProcess::FailedToStart : + case QProcess::FailedToStart: processReturnString += tr("<b>Reason could be:</b> ") + "The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program.<br>"; break; - case QProcess::Crashed : + case QProcess::Crashed: processReturnString += "The process crashed some time after starting successfully.<br>"; break; - case QProcess::Timedout : + case QProcess::Timedout: processReturnString += "The called indenter did not response for over 10 seconds, so aborted its execution.<br>"; break; - case QProcess::WriteError : + case QProcess::WriteError: processReturnString += "An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.<br>"; break; - case QProcess::ReadError : + case QProcess::ReadError: processReturnString += "An error occurred when attempting to read from the process. For example, the process may not be running.<br>"; break; - case QProcess::UnknownError : + case QProcess::UnknownError: processReturnString += "An unknown error occurred. This is the default return value of error().<br>"; break; - default : + default: break; } processReturnString += tr("<br><b>Callstring was:</b> ") + indenterCompleteCallString; @@ -501,25 +500,25 @@ QString exitCode; exitCode.setNum(indentProcess.exitCode()); processReturnString = tr("<b>Indenter returned with exit code:</b> ") + exitCode + "<br>" + - tr("<b>Indent console output was:</b> ") + processReturnString + "<br>" + - tr("<br><b>Callstring was:</b> ") + indenterCompleteCallString + "</html></body>"; + tr("<b>Indent console output was:</b> ") + processReturnString + "<br>" + + tr("<br><b>Callstring was:</b> ") + indenterCompleteCallString + "</html></body>"; QApplication::restoreOverrideCursor(); errorMessageDialog->showMessage( tr("Indenter returned error"), processReturnString ); } // If the indenter results are written to stdout, read them from there... - if ( indentProcess.exitCode() == 0 && outputFileParameter == "stdout" ) { - formattedSourceCode = processReturnString; - } + if ( indentProcess.exitCode() == 0 && outputFileParameter == "stdout" ) { + formattedSourceCode = processReturnString; + } // ... else read the output file generated by the indenter call. - else { - QFile outSrcFile(tempDirctoryStr + "/" + outputFileName + inputFileExtension); - outSrcFile.open(QFile::ReadOnly | QFile::Text); - QTextStream outSrcStrm(&outSrcFile); - outSrcStrm.setCodec( QTextCodec::codecForName("UTF-8") ); - formattedSourceCode = outSrcStrm.readAll(); - outSrcFile.close(); - } + else { + QFile outSrcFile(tempDirctoryStr + "/" + outputFileName + inputFileExtension); + outSrcFile.open(QFile::ReadOnly | QFile::Text); + QTextStream outSrcStrm(&outSrcFile); + outSrcStrm.setCodec( QTextCodec::codecForName("UTF-8") ); + formattedSourceCode = outSrcStrm.readAll(); + outSrcFile.close(); + } // Delete the temporary input and output files. QFile::remove(tempDirctoryStr + "/" + outputFileName + inputFileExtension); @@ -533,7 +532,6 @@ \brief Generates and returns a string with all parameters needed to call the indenter. */ QString IndentHandler::getParameterString() { - QString parameterString = ""; // generate parameter string for all boolean values @@ -595,7 +593,6 @@ \brief Load the config file for the indenter and apply the settings made there. */ bool IndentHandler::loadConfigFile(QString filePathName) { - QFile cfgFile(filePathName); int index; int crPos; @@ -617,7 +614,6 @@ // Search for name of each boolean parameter and set its value if found. foreach (ParamBoolean pBoolean, paramBooleans) { - // boolean value that will be assigned to the checkbox bool paramValue = false; @@ -721,7 +717,7 @@ else { paramValueStr = paramValueStr + "|" + QString( cfgFileData.mid( index, crPos - index ) ); } - + // Get next value for this setting, if one exists. index = cfgFileData.indexOf( pString.paramCallName, crPos+1, Qt::CaseInsensitive ); } @@ -769,7 +765,6 @@ \brief Sets all indenter parameters to their default values defined in the ini file. */ void IndentHandler::resetToDefaultValues() { - // Search for name of each boolean parameter and set its value if found. foreach (ParamBoolean pBoolean, paramBooleans) { // Boolean value that will be assigned to the checkbox. @@ -782,7 +777,6 @@ int defaultValue = indenterSettings->value(pNumeric.paramName + "/ValueDefault").toInt(); pNumeric.spinBox->setValue( defaultValue ); pNumeric.valueEnabledChkBox->setChecked( indenterSettings->value(pNumeric.paramName + "/Enabled").toBool() ); - } // Search for name of each string parameter and set it. @@ -797,7 +791,6 @@ int defaultValue = indenterSettings->value(pMultiple.paramName + "/ValueDefault").toInt(); pMultiple.comboBox->setCurrentIndex( defaultValue ); pMultiple.valueEnabledChkBox->setChecked( indenterSettings->value(pMultiple.paramName + "/Enabled").toBool() ); - } } @@ -829,9 +822,9 @@ cfgFileParameterEnding = "\n"; } indenterShowHelpParameter = indenterSettings->value("header/showHelpParameter").toString(); - + if ( indenterFileName.isEmpty() ) { - errorMessageDialog->showMessage( tr("Indenter ini file header error"), + errorMessageDialog->showMessage( tr("Indenter ini file header error"), tr("The loaded indenter ini file \"%1\"has a faulty header. At least the indenters file name is not set.").arg(iniFilePath) ); } @@ -848,10 +841,10 @@ // read the categories names which are separated by "|" QString categoriesStr = indenterSettings->value("header/categories").toString(); categories = categoriesStr.split("|"); - // Assure that the category list is never empty. At least contain a "general" section. - if ( categories.isEmpty() ) { - categories.append("General"); - } + // Assure that the category list is never empty. At least contain a "general" section. + if ( categories.isEmpty() ) { + categories.append("General"); + } ToolBoxPage toolBoxPage; @@ -878,13 +871,12 @@ // read each parameter to create the corresponding input field foreach (QString indenterParameter, indenterParameters) { - // if it is not the indent header definition read the parameter and add it to // the corresponding category toolbox page if ( indenterParameter != "header") { // read to which category the parameter belongs int category = indenterSettings->value(indenterParameter + "/Category").toInt(); - // Assure that the category number is never greater than the available categories. + // Assure that the category number is never greater than the available categories. if ( category > toolBoxPages.size()-1 ) { category = toolBoxPages.size()-1; } @@ -915,13 +907,13 @@ spinBox->installEventFilter( mainWindow ); } if ( indenterSettings->value(indenterParameter + "/MinVal").toString() != "" ) { - spinBox->setMinimum( indenterSettings->value(indenterParameter + "/MinVal").toInt() ); + spinBox->setMinimum( indenterSettings->value(indenterParameter + "/MinVal").toInt() ); } else { spinBox->setMinimum( 0 ); } if ( indenterSettings->value(indenterParameter + "/MaxVal").toString() != "" ) { - spinBox->setMaximum( indenterSettings->value(indenterParameter + "/MaxVal").toInt() ); + spinBox->setMaximum( indenterSettings->value(indenterParameter + "/MaxVal").toInt() ); } else { spinBox->setMaximum( 2000 ); @@ -1050,14 +1042,14 @@ // create the combo box QComboBox *comboBox = new QComboBox( toolBoxPages.at(category).page ); - QStringList choicesStrings = indenterSettings->value(indenterParameter + "/Choices").toString().split("|"); - QStringList choicesStringsReadable = indenterSettings->value(indenterParameter + "/ChoicesReadable").toString().split("|", QString::SkipEmptyParts); - if ( choicesStringsReadable.isEmpty() ) { - comboBox->addItems( choicesStrings ); - } - else { - comboBox->addItems( choicesStringsReadable ); - } + QStringList choicesStrings = indenterSettings->value(indenterParameter + "/Choices").toString().split("|"); + QStringList choicesStringsReadable = indenterSettings->value(indenterParameter + "/ChoicesReadable").toString().split("|", QString::SkipEmptyParts); + if ( choicesStringsReadable.isEmpty() ) { + comboBox->addItems( choicesStrings ); + } + else { + comboBox->addItems( choicesStringsReadable ); + } paramToolTip = indenterSettings->value(indenterParameter + "/Description").toString(); comboBox->setToolTip( paramToolTip ); if ( mainWindow != NULL ) { @@ -1075,8 +1067,8 @@ paramMultiple.paramName = indenterParameter; paramMultiple.paramCallName = parameterCallName; paramMultiple.comboBox = comboBox; - paramMultiple.choicesStrings = choicesStrings; - paramMultiple.choicesStringsReadable = choicesStringsReadable; + paramMultiple.choicesStrings = choicesStrings; + paramMultiple.choicesStringsReadable = choicesStringsReadable; paramMultiple.valueEnabledChkBox = chkBox; paramMultiple.comboBox->setCurrentIndex( indenterSettings->value(paramMultiple.paramName + "/ValueDefault").toInt() ); paramMultiples.append(paramMultiple); @@ -1087,7 +1079,6 @@ connect( comboBox, SIGNAL(activated(int)), comboBox, SLOT(repaint()) ); #endif // UNIVERSALINDENTGUI_NPP_EXPORTS } - } } @@ -1109,7 +1100,6 @@ // Loop for every existing uigui ini file foreach (QString indenterIniFile, indenterIniFileList) { - // Open the ini file and search for the indenter name QFile file(indenterDirctoryStr + "/" + indenterIniFile); if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { @@ -1219,11 +1209,11 @@ */ bool IndentHandler::createIndenterCallString() { QProcess indentProcess; - + if ( indenterFileName.isEmpty() ) { return false; } - + // First try to call the indenter inside of the data dir, using some suffix // ------------------------------------------------------------------------ @@ -1237,7 +1227,6 @@ // Only try to call the indenter, if the file exists. if ( QFile::exists(indenterExecutableCallString) ) { - // Only try to call the indenter directly if it is no php file if ( QFileInfo(indenterExecutableCallString).suffix().toLower() != "php" ) { indentProcess.start( "\"" + indenterExecutableCallString + + "\" " + indenterShowHelpParameter ); @@ -1250,7 +1239,7 @@ return true; } } - + // Test for needed interpreters // ---------------------------- // If the file could not be executed, try to find a shebang at its start or test if its a php file. @@ -1287,7 +1276,7 @@ } // now we know an interpreter is needed but it could not be called, so inform the user. else { - errorMessageDialog->showMessage( tr("Interpreter needed"), + errorMessageDialog->showMessage( tr("Interpreter needed"), tr("To use the selected indenter the program \"%1\" needs to be available in the global environment. You should add an entry to your path settings.").arg(interpreterName) ); return true; } @@ -1503,7 +1492,6 @@ but asks the user whether to do it really. */ void IndentHandler::resetIndenterParameter() { - int messageBoxAnswer = QMessageBox::question(this, tr("Really reset parameters?"), tr("Do you really want to reset the indenter parameters to the default values?"), QMessageBox::Yes | QMessageBox::Abort ); if ( messageBoxAnswer == QMessageBox::Yes ) { resetToDefaultValues(); @@ -1513,7 +1501,7 @@ /*! \brief Catch some events and let some other be handled by the super class. - + Is needed for use as Notepad++ plugin. */ bool IndentHandler::event( QEvent *event ) { @@ -1524,7 +1512,7 @@ else if ( event->type() == QEvent::WindowDeactivate ) { event->accept(); return true; - } + } else { event->ignore(); return QWidget::event(event); @@ -1535,7 +1523,7 @@ /*! \brief Sets the function pointer \a parameterChangedCallback to the given callback function \a paramChangedCallback. - + Is needed for use as Notepad++ plugin. */ void IndentHandler::setParameterChangedCallback( void(*paramChangedCallback)(void) ) { @@ -1545,7 +1533,7 @@ /*! \brief Emits the \a indenterSettingsChanged signal and if set executes the \a parameterChangedCallback function. - + Is needed for use as Notepad++ plugin. */ void IndentHandler::handleChangedIndenterSettings() { @@ -1559,7 +1547,7 @@ /*! \brief Sets a callback function that shall be called, when the this indenter parameter window gets closed. - + Is needed for use as Notepad++ plugin. */ void IndentHandler::setWindowClosedCallback( void(*winClosedCallback)(void) ) { @@ -1569,7 +1557,7 @@ /*! \brief Is called on this indenter parameter window close and if set calls the function \a windowClosedCallback. - + Is needed for use as Notepad++ plugin. */ void IndentHandler::closeEvent(QCloseEvent *event) {
--- a/src/main.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/main.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -56,7 +56,7 @@ QMessageBox::information( NULL, "Need additional parameter", "The parameter -f / --file needs a following parameter defining the file to be opened at start." ); fprintf(stderr, "The parameter -f / --file needs a following parameter defining the file to be opened at start."); exit(1); - } + } // Set the file that shall be opened a start. else { i++; @@ -71,18 +71,18 @@ } else { QString message = "Invalid parameter found. Allowed parameters are:\n" \ - "No parameters starts without server and full gui.\n" \ - "-f filename --file filename : Opens the by filename defined file on start.\n" \ - "-p --plugin : Run as plugin. Server will be startet with a simplified gui.\n" \ - "-s --server : Run as server only without gui.\n" - "If -p and -s are set, -p will be used."; + "No parameters starts without server and full gui.\n" \ + "-f filename --file filename : Opens the by filename defined file on start.\n" \ + "-p --plugin : Run as plugin. Server will be startet with a simplified gui.\n" \ + "-s --server : Run as server only without gui.\n" + "If -p and -s are set, -p will be used."; QMessageBox::information( NULL, "Invalid parameter", message ); fprintf(stderr, "Invalid parameter found. Allowed parameters are..."); exit(1); } } - - + + // Set default values for all by UniversalIndentGUI used settings objects. QCoreApplication::setOrganizationName("UniversalIndentGUI"); QCoreApplication::setOrganizationDomain("universalindent.sf.net"); @@ -117,7 +117,7 @@ else if ( startAsServer ) { server.stopServer(); } - + UiguiSettings::deleteInstance(); return returnValue;
--- a/src/mainwindow.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/mainwindow.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -46,7 +46,7 @@ scrollPositionChanged = false; // Create the settings object, which loads all UiGui settings from a file. - settings = UiguiSettings::getInstance(); + settings = UiguiSettings::getInstance(); // Initialize the language of the application. initApplicationLanguage(); @@ -69,7 +69,7 @@ // Create some menus. createEncodingMenu(); createHighlighterMenu(); - + // generate about dialog box aboutDialog = new AboutDialog(this, Qt::SplashScreen, version, revision, buildDateStr); @@ -77,8 +77,8 @@ connect( toolBarWidget->pbAbout, SIGNAL(clicked()), this, SLOT(showAboutDialog()) ); connect( actionAbout_UniversalIndentGUI, SIGNAL(triggered()), this, SLOT(showAboutDialog()) ); - // generate settings dialog box - settingsDialog = new UiguiSettingsDialog(this, settings); + // generate settings dialog box + settingsDialog = new UiguiSettingsDialog(this, settings); connect( actionShowSettings, SIGNAL(triggered()), settingsDialog, SLOT(showDialog()) ); // If a file that should be opened on start has been handed over to the constructor exists, load it @@ -106,19 +106,19 @@ \brief Initializes the main window by creating the main gui and make some settings. */ void MainWindow::initMainWindow() { - // Generate gui as it is build in the file "mainwindow.ui" + // Generate gui as it is build in the file "mainwindow.ui" setupUi(this); - // Handle last opened window size - // ------------------------------ - bool maximized = settings->getValueByName("WindowIsMaximized").toBool(); - QPoint pos = settings->getValueByName("WindowPosition").toPoint(); - QSize size = settings->getValueByName("WindowSize").toSize(); - resize(size); - move(pos); - if ( maximized ) { - showMaximized(); - } + // Handle last opened window size + // ------------------------------ + bool maximized = settings->getValueByName("WindowIsMaximized").toBool(); + QPoint pos = settings->getValueByName("WindowPosition").toPoint(); + QSize size = settings->getValueByName("WindowSize").toSize(); + resize(size); + move(pos); + if ( maximized ) { + showMaximized(); + } #ifndef Q_OS_MAC // On Mac restoring the window state causes the screenshot no longer to work. restoreState( settings->getValueByName("MainWindowState").toByteArray() ); #endif @@ -126,17 +126,17 @@ // Handle if first run of this version // ----------------------------------- QString readVersion = settings->getValueByName("VersionInSettingsFile").toString(); - // If version strings are not equal set first run true. - if ( readVersion != version ) { - isFirstRunOfThisVersion = true; - } - else { - isFirstRunOfThisVersion = false; - } + // If version strings are not equal set first run true. + if ( readVersion != version ) { + isFirstRunOfThisVersion = true; + } + else { + isFirstRunOfThisVersion = false; + } // Get last selected file encoding - // ------------------------------- - currentEncoding = settings->getValueByName("FileEncoding").toString(); + // ------------------------------- + currentEncoding = settings->getValueByName("FileEncoding").toString(); updateCheckDialog = new UpdateCheckDialog(version, settings, this); @@ -202,7 +202,6 @@ \brief Create and initialize the text editor component. It uses the QScintilla widget. */ void MainWindow::initTextEditor() { - QMessageBox infoQScintillaLoad(NULL); infoQScintillaLoad.setWindowTitle("Loading QScintilla..."); infoQScintillaLoad.setText("Trying to load QScintilla library.\nIf anything fails during loading, it might be possible that the debug and release version of QScintilla are mixed."); @@ -213,26 +212,26 @@ qSciSourceCodeEditor = new QsciScintilla(this); } catch (...) { - QMessageBox::critical(this, "Error creating QScintilla text editor component!", + QMessageBox::critical(this, "Error creating QScintilla text editor component!", "During trying to create the text editor component, that is based on QScintilla, an error occurred. Please make sure that you have installed QScintilla and not mixed release and debug versions." ); exit(1); } infoQScintillaLoad.hide(); - hboxLayout1->addWidget(qSciSourceCodeEditor); + hboxLayout1->addWidget(qSciSourceCodeEditor); // Make some settings for the QScintilla widget. qSciSourceCodeEditor->setUtf8(true); qSciSourceCodeEditor->setMarginLineNumbers(1, true); - qSciSourceCodeEditor->setMarginWidth(1, QString("10000") ); - qSciSourceCodeEditor->setBraceMatching(qSciSourceCodeEditor->SloppyBraceMatch); - qSciSourceCodeEditor->setMatchedBraceForegroundColor( QColor("red") ); - qSciSourceCodeEditor->setFolding(QsciScintilla::BoxedTreeFoldStyle); - qSciSourceCodeEditor->setAutoCompletionSource(QsciScintilla::AcsAll); - qSciSourceCodeEditor->setAutoCompletionThreshold(3); + qSciSourceCodeEditor->setMarginWidth(1, QString("10000") ); + qSciSourceCodeEditor->setBraceMatching(qSciSourceCodeEditor->SloppyBraceMatch); + qSciSourceCodeEditor->setMatchedBraceForegroundColor( QColor("red") ); + qSciSourceCodeEditor->setFolding(QsciScintilla::BoxedTreeFoldStyle); + qSciSourceCodeEditor->setAutoCompletionSource(QsciScintilla::AcsAll); + qSciSourceCodeEditor->setAutoCompletionThreshold(3); // Handle if white space is set to be visible - bool whiteSpaceIsVisible = settings->getValueByName("WhiteSpaceIsVisible").toBool(); + bool whiteSpaceIsVisible = settings->getValueByName("WhiteSpaceIsVisible").toBool(); setWhiteSpaceVisibility( whiteSpaceIsVisible ); // Handle the width of tabs in spaces @@ -250,7 +249,7 @@ // Connect the text editor to dependent functions. connect( qSciSourceCodeEditor, SIGNAL(textChanged()), this, SLOT(sourceCodeChangedHelperSlot()) ); - connect( qSciSourceCodeEditor, SIGNAL(linesChanged()), this, SLOT(numberOfLinesChanged()) ); + connect( qSciSourceCodeEditor, SIGNAL(linesChanged()), this, SLOT(numberOfLinesChanged()) ); connect( settings, SIGNAL(tabWidth(int)), qSciSourceCodeEditor, SLOT(setTabWidth(int)) ); qSciSourceCodeEditor->setTabWidth( settings->getValueByName("TabWidth").toInt() ); } @@ -264,8 +263,8 @@ highlighter = new UiguiHighlighter(qSciSourceCodeEditor); // Handle if syntax highlighting is enabled - bool syntaxHighlightningEnabled = settings->getValueByName("SyntaxHighlightningEnabled").toBool(); - if ( syntaxHighlightningEnabled ) { + bool syntaxHighlightningEnabled = settings->getValueByName("SyntaxHighlightningEnabled").toBool(); + if ( syntaxHighlightningEnabled ) { highlighter->turnHighlightOn(); } else { @@ -287,7 +286,7 @@ QString languageShort; // Get the language settings from the settings object. - int languageIndex = settings->getValueByName("Language").toInt(); + int languageIndex = settings->getValueByName("Language").toInt(); // If no language was set, indicated by a negative index, use the system language. if ( languageIndex < 0 ) { @@ -338,7 +337,7 @@ */ void MainWindow::initIndenter() { // Get Id of last selected indenter. - currentIndenterID = settings->getValueByName("SelectedIndenter").toInt(); + currentIndenterID = settings->getValueByName("SelectedIndenter").toInt(); // Create the indenter widget with the ID and add it to the layout. indentHandler = new IndentHandler(currentIndenterID, this, centralwidget); @@ -358,7 +357,6 @@ // Add the indenters context menu to the mainwindows menu. menuIndenter->addActions( indentHandler->getIndenterMenuActions() ); - } @@ -368,7 +366,6 @@ If the file could not be loaded a error dialog will be shown. */ QString MainWindow::loadFile(QString filePath) { - QFile inSrcFile(filePath); QString fileContent = ""; @@ -383,9 +380,9 @@ QApplication::restoreOverrideCursor(); inSrcFile.close(); - QFileInfo fileInfo(filePath); - currentSourceFileExtension = fileInfo.suffix(); - int indexOfHighlighter = highlighter->setLexerForExtension( currentSourceFileExtension ); + QFileInfo fileInfo(filePath); + currentSourceFileExtension = fileInfo.suffix(); + int indexOfHighlighter = highlighter->setLexerForExtension( currentSourceFileExtension ); highlighterActionGroup->actions().at(indexOfHighlighter)->setChecked(true); } return fileContent; @@ -408,9 +405,9 @@ ");;"+tr("All files")+" (*.*)"; //QString openedSourceFileContent = openFileDialog( tr("Choose source code file"), "./", fileExtensions ); - if ( fileName.isEmpty() ) { - fileName = QFileDialog::getOpenFileName( this, tr("Choose source code file"), currentSourceFile, fileExtensions); - } + if ( fileName.isEmpty() ) { + fileName = QFileDialog::getOpenFileName( this, tr("Choose source code file"), currentSourceFile, fileExtensions); + } if (fileName != "") { currentSourceFile = fileName; @@ -461,7 +458,7 @@ QFile::remove(fileName); QFile outSrcFile(fileName); outSrcFile.open( QFile::ReadWrite | QFile::Text ); - + // Get current encoding. if ( chosenEncodingAction != NULL ) { encoding = chosenEncodingAction->text(); @@ -522,7 +519,6 @@ and with a file mask defined by \a fileMaskStr. Returns the contents of the file as QString. */ QString MainWindow::openFileDialog(QString dialogHeaderStr, QString startPath, QString fileMaskStr) { - QString fileContent = ""; QString fileName = QFileDialog::getOpenFileName( NULL, dialogHeaderStr, startPath, fileMaskStr); @@ -555,9 +551,9 @@ if (previewToggled) { disconnect( qSciSourceCodeEditor, SIGNAL(textChanged ()), this, SLOT(sourceCodeChangedHelperSlot()) ); - bool textIsModified = isWindowModified(); + bool textIsModified = isWindowModified(); qSciSourceCodeEditor->setText(sourceViewContent); - setWindowModified(textIsModified); + setWindowModified(textIsModified); previewToggled = false; connect( qSciSourceCodeEditor, SIGNAL(textChanged ()), this, SLOT(sourceCodeChangedHelperSlot()) ); } @@ -598,7 +594,7 @@ \brief Added this slot to avoid multiple calls because of changed text. */ void MainWindow::sourceCodeChangedHelperSlot() { - QTimer::singleShot(0, this, SLOT(sourceCodeChangedSlot())); + QTimer::singleShot(0, this, SLOT(sourceCodeChangedSlot())); } @@ -608,8 +604,8 @@ */ void MainWindow::sourceCodeChangedSlot() { QChar enteredCharacter; - int cursorPos, cursorPosAbsolut, cursorLine; - QString text; + int cursorPos, cursorPosAbsolut, cursorLine; + QString text; sourceCodeChanged = true; if ( scrollPositionChanged ) { @@ -618,7 +614,7 @@ // Get the content text of the text editor. sourceFileContent = qSciSourceCodeEditor->text(); - + // Get the position of the cursor in the unindented text. if ( sourceFileContent.isEmpty() ) { // Add this line feed, because AStyle has problems with a totally emtpy file. @@ -631,7 +627,7 @@ else { qSciSourceCodeEditor->getCursorPosition(&cursorLine, &cursorPos); cursorPosAbsolut = qSciSourceCodeEditor->SendScintilla(QsciScintillaBase::SCI_GETCURRENTPOS); - text = qSciSourceCodeEditor->text(cursorLine); + text = qSciSourceCodeEditor->text(cursorLine); if ( cursorPosAbsolut > 0 ) { cursorPosAbsolut--; } @@ -666,7 +662,7 @@ } if ( cursorPos >= text.count() ) { cursorPos = 0; - } + } else { charFound = true; break; @@ -688,7 +684,7 @@ } if ( cursorPos < 0 ) { cursorPos = qSciSourceCodeEditor->lineLength(cursorLine-1) - 1; - } + } else { charFound = true; break; @@ -739,8 +735,8 @@ void MainWindow::indentSettingsChangedSlot() { indentSettingsChanged = true; - int cursorLine, cursorPos; - qSciSourceCodeEditor->getCursorPosition(&cursorLine, &cursorPos); + int cursorLine, cursorPos; + qSciSourceCodeEditor->getCursorPosition(&cursorLine, &cursorPos); if ( toolBarWidget->cbLivePreview->isChecked() ) { callIndenter(); @@ -783,8 +779,8 @@ void MainWindow::previewTurnedOnOff(bool turnOn) { previewToggled = true; - int cursorLine, cursorPos; - qSciSourceCodeEditor->getCursorPosition(&cursorLine, &cursorPos); + int cursorLine, cursorPos; + qSciSourceCodeEditor->getCursorPosition(&cursorLine, &cursorPos); if ( turnOn && (indentSettingsChanged || sourceCodeChanged) ) { callIndenter(); @@ -839,7 +835,7 @@ QsciPrinter printer(QPrinter::HighResolution); printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFileName(fileName); - printer.printRange(qSciSourceCodeEditor); + printer.printRange(qSciSourceCodeEditor); } } @@ -848,7 +844,7 @@ \brief Opens a dialog to save the current source code as a HTML document. */ void MainWindow::exportToHTML() { - QString fileExtensions = tr("HTML Document")+" (*.html)"; + QString fileExtensions = tr("HTML Document")+" (*.html)"; QString fileName = currentSourceFile; QFileInfo fileInfo(fileName); @@ -876,46 +872,46 @@ /*! - \brief Loads the last opened file if this option is enabled in the settings. - + \brief Loads the last opened file if this option is enabled in the settings. + If the file does not exist, the default example file is tried to be loaded. If even that fails a very small code example is shown. If the setting for opening the last file is disabled, the editor is empty on startup. */ void MainWindow::loadLastOpenedFile() { // Get setting for last opened source code file. - loadLastSourceCodeFileOnStartup = settings->getValueByName("LoadLastOpenedFileOnStartup").toBool(); + loadLastSourceCodeFileOnStartup = settings->getValueByName("LoadLastOpenedFileOnStartup").toBool(); - // Only load last source code file if set to do so - if ( loadLastSourceCodeFileOnStartup ) { + // Only load last source code file if set to do so + if ( loadLastSourceCodeFileOnStartup ) { // From the list of last opened files get the first one. currentSourceFile = settings->getValueByName("LastOpenedFiles").toString().split("|").first(); - // If source file exist load it. - if ( QFile::exists(currentSourceFile) ) { - QFileInfo fileInfo(currentSourceFile); - currentSourceFile = fileInfo.absoluteFilePath(); - sourceFileContent = loadFile(currentSourceFile); - } + // If source file exist load it. + if ( QFile::exists(currentSourceFile) ) { + QFileInfo fileInfo(currentSourceFile); + currentSourceFile = fileInfo.absoluteFilePath(); + sourceFileContent = loadFile(currentSourceFile); + } // If the last opened source code file does not exist, try to load the default example.cpp file. else if ( QFile::exists( SettingsPaths::getIndenterPath() + "/example.cpp" ) ) { - QFileInfo fileInfo( SettingsPaths::getIndenterPath() + "/example.cpp" ); - currentSourceFile = fileInfo.absoluteFilePath(); - sourceFileContent = loadFile(currentSourceFile); - } - // If neither the example source code file exists show some small code example. - else { - currentSourceFile = "untitled.cpp"; - currentSourceFileExtension = "cpp"; - sourceFileContent = "if(x==\"y\"){x=z;}"; - } - } - // if last opened source file should not be loaded make some default settings. - else { - currentSourceFile = "untitled.cpp"; - currentSourceFileExtension = "cpp"; - sourceFileContent = ""; - } + QFileInfo fileInfo( SettingsPaths::getIndenterPath() + "/example.cpp" ); + currentSourceFile = fileInfo.absoluteFilePath(); + sourceFileContent = loadFile(currentSourceFile); + } + // If neither the example source code file exists show some small code example. + else { + currentSourceFile = "untitled.cpp"; + currentSourceFileExtension = "cpp"; + sourceFileContent = "if(x==\"y\"){x=z;}"; + } + } + // if last opened source file should not be loaded make some default settings. + else { + currentSourceFile = "untitled.cpp"; + currentSourceFileExtension = "cpp"; + sourceFileContent = ""; + } savedSourceContent = sourceFileContent; // Update the mainwindow title to show the name of the loaded source code file. @@ -929,13 +925,13 @@ Settings are for example last selected indenter, last loaded config file and so on. */ void MainWindow::saveSettings() { - settings->setValueByName( "FileEncoding", currentEncoding ); + settings->setValueByName( "FileEncoding", currentEncoding ); settings->setValueByName( "VersionInSettingsFile", version ); - settings->setValueByName( "WindowIsMaximized", isMaximized() ); - if ( !isMaximized() ) { - settings->setValueByName( "WindowPosition", pos() ); - settings->setValueByName( "WindowSize", size() ); - } + settings->setValueByName( "WindowIsMaximized", isMaximized() ); + if ( !isMaximized() ) { + settings->setValueByName( "WindowPosition", pos() ); + settings->setValueByName( "WindowSize", size() ); + } settings->setValueByName( "MainWindowState", saveState() ); // Also save the syntax highlight style for all lexers. @@ -958,10 +954,10 @@ /*! - \brief This function is setup to capture tooltip events. - - All widgets that are created by the indentHandler object and are responsible - for indenter parameters are connected with this event filter. + \brief This function is setup to capture tooltip events. + + All widgets that are created by the indentHandler object and are responsible + for indenter parameters are connected with this event filter. So depending on the settings the tooltips can be enabled and disabled for these widgets. */ bool MainWindow::eventFilter(QObject *obj, QEvent *event) @@ -974,7 +970,8 @@ //QToolTip::showText( QPoint(100,100) , "Test1"); return true; } - } else { + } + else { // pass the event on to the parent class return QMainWindow::eventFilter(obj, event); } @@ -989,7 +986,7 @@ if ( isWindowModified() ) { int ret = QMessageBox::warning(this, tr("Modified code"), tr("The source code has been modified.\n" - "Do you want to save your changes?"), + "Do you want to save your changes?"), QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape); @@ -1010,13 +1007,13 @@ */ void MainWindow::languageChanged(int languageIndex) { // Get the mnemonic of the new selected language. - QString languageShort = settings->getAvailableTranslations().at(languageIndex); + QString languageShort = settings->getAvailableTranslations().at(languageIndex); - // Remove the old qt translation. - qApp->removeTranslator( qTTranslator ); + // Remove the old qt translation. + qApp->removeTranslator( qTTranslator ); // Remove the old uigui translation. - qApp->removeTranslator( uiGuiTranslator ); + qApp->removeTranslator( uiGuiTranslator ); // Load the Qt own translation file and set it for the application. bool translationFileLoaded; @@ -1041,10 +1038,10 @@ QString encodingName; encodingsList = QStringList() << "UTF-8" << "UTF-16" << "UTF-16BE" << "UTF-16LE" - << "Apple Roman" << "Big5" << "Big5-HKSCS" << "EUC-JP" << "EUC-KR" << "GB18030-0" - << "IBM 850" << "IBM 866" << "IBM 874" << "ISO 2022-JP" << "ISO 8859-1" << "ISO 8859-13" - << "Iscii-Bng" << "JIS X 0201" << "JIS X 0208" << "KOI8-R" << "KOI8-U" << "MuleLao-1" - << "ROMAN8" << "Shift-JIS" << "TIS-620" << "TSCII" << "Windows-1250" << "WINSAMI2"; + << "Apple Roman" << "Big5" << "Big5-HKSCS" << "EUC-JP" << "EUC-KR" << "GB18030-0" + << "IBM 850" << "IBM 866" << "IBM 874" << "ISO 2022-JP" << "ISO 8859-1" << "ISO 8859-13" + << "Iscii-Bng" << "JIS X 0201" << "JIS X 0208" << "KOI8-R" << "KOI8-U" << "MuleLao-1" + << "ROMAN8" << "Shift-JIS" << "TIS-620" << "TSCII" << "Windows-1250" << "WINSAMI2"; encodingActionGroup = new QActionGroup(this); saveEncodedActionGroup = new QActionGroup(this); @@ -1108,60 +1105,60 @@ QTextStream inSrcStrm(&inSrcFile); QApplication::setOverrideCursor(Qt::WaitCursor); QString encodingName = encodingAction->text(); - currentEncoding = encodingName; + currentEncoding = encodingName; inSrcStrm.setCodec( QTextCodec::codecForName(encodingName.toAscii()) ); fileContent = inSrcStrm.readAll(); QApplication::restoreOverrideCursor(); inSrcFile.close(); qSciSourceCodeEditor->setText( fileContent ); - qSciSourceCodeEditor->setModified(false); + qSciSourceCodeEditor->setModified(false); } } } /*! - \brief Creates a menu entry under the settings menu for all available text encodings. + \brief Creates a menu entry under the settings menu for all available text encodings. */ void MainWindow::createHighlighterMenu() { - QAction *highlighterAction; - QString highlighterName; + QAction *highlighterAction; + QString highlighterName; - highlighterActionGroup = new QActionGroup(this); + highlighterActionGroup = new QActionGroup(this); - // Loop for each known highlighter + // Loop for each known highlighter foreach ( highlighterName, highlighter->getAvailableHighlighters() ) { - highlighterAction = new QAction(highlighterName, highlighterActionGroup); - highlighterAction->setStatusTip( tr("Set the syntax highlightning to ") + highlighterName ); - highlighterAction->setCheckable(true); - } - highlighterMenu->addActions( highlighterActionGroup->actions() ); + highlighterAction = new QAction(highlighterName, highlighterActionGroup); + highlighterAction->setStatusTip( tr("Set the syntax highlightning to ") + highlighterName ); + highlighterAction->setCheckable(true); + } + highlighterMenu->addActions( highlighterActionGroup->actions() ); menuSettings->insertMenu(indenterParameterTooltipsEnabledAction, highlighterMenu ); - connect( highlighterActionGroup, SIGNAL(triggered(QAction*)), highlighter, SLOT(setHighlighterByAction(QAction*)) ); + connect( highlighterActionGroup, SIGNAL(triggered(QAction*)), highlighter, SLOT(setHighlighterByAction(QAction*)) ); } /*! - \brief Is called whenever the white space visibility is being changed in the menu. + \brief Is called whenever the white space visibility is being changed in the menu. */ void MainWindow::setWhiteSpaceVisibility(bool visible) { - if ( visible ) { - qSciSourceCodeEditor->setWhitespaceVisibility(QsciScintilla::WsVisible); - } - else { - qSciSourceCodeEditor->setWhitespaceVisibility(QsciScintilla::WsInvisible); - } + if ( visible ) { + qSciSourceCodeEditor->setWhitespaceVisibility(QsciScintilla::WsVisible); + } + else { + qSciSourceCodeEditor->setWhitespaceVisibility(QsciScintilla::WsInvisible); + } } /*! - \brief This slot is called whenever the number of lines in the editor changes - and adapts the margin for the displayed line numbers. + \brief This slot is called whenever the number of lines in the editor changes + and adapts the margin for the displayed line numbers. */ void MainWindow::numberOfLinesChanged() { - QString lineNumbers; - lineNumbers.setNum( qSciSourceCodeEditor->lines()*10 ); - qSciSourceCodeEditor->setMarginWidth(1, lineNumbers); + QString lineNumbers; + lineNumbers.setNum( qSciSourceCodeEditor->lines()*10 ); + qSciSourceCodeEditor->setMarginWidth(1, lineNumbers); } @@ -1184,7 +1181,7 @@ // Translate the indent handler widget. indentHandler->retranslateUi(); - // Translate the load encoding menu. + // Translate the load encoding menu. QList<QAction *> encodingActionList = encodingActionGroup->actions(); for ( i = 0; i < encodingActionList.size(); i++ ) { encodingActionList.at(i)->setStatusTip( tr("Reopen the currently opened source code file by using the text encoding scheme ") + encodingsList.at(i) ); @@ -1209,7 +1206,7 @@ int line, column; qSciSourceCodeEditor->getCursorPosition( &line, &column ); setStatusBarCursorPosInfo( line, column ); - } + } else { QWidget::changeEvent(event); } @@ -1218,16 +1215,15 @@ /*! - \brief Updates the list of recently opened files. - - Therefore the currently open file is set at the lists first position - regarding the in the settings set maximum list length. Overheads of the - list will be cut off. The new list will be updated to the settings and + \brief Updates the list of recently opened files. + + Therefore the currently open file is set at the lists first position + regarding the in the settings set maximum list length. Overheads of the + list will be cut off. The new list will be updated to the settings and the recently opened menu will be updated too. */ void MainWindow::updateRecentlyOpenedList() { - - QString fileName; + QString fileName; QString filePath; QStringList recentlyOpenedList = settings->getValueByName("LastOpenedFiles").toString().split("|"); QList<QAction*> recentlyOpenedActionList = menuRecently_Opened_Files->actions(); @@ -1243,28 +1239,28 @@ // Put the current file at the first position if it not already is and is not empty. else if ( indexOfCurrentFile == -1 && !currentSourceFile.isEmpty() ) { recentlyOpenedList.insert(0, currentSourceFile); - QAction *recentlyOpenedAction = new QAction(QFileInfo(currentSourceFile).fileName(), menuRecently_Opened_Files); - recentlyOpenedAction->setStatusTip(currentSourceFile); + QAction *recentlyOpenedAction = new QAction(QFileInfo(currentSourceFile).fileName(), menuRecently_Opened_Files); + recentlyOpenedAction->setStatusTip(currentSourceFile); recentlyOpenedActionList.insert(0, recentlyOpenedAction ); } - // Get the maximum recently opened list size. - int recentlyOpenedListMaxSize = settings->getValueByName("RecentlyOpenedListSize").toInt(); + // Get the maximum recently opened list size. + int recentlyOpenedListMaxSize = settings->getValueByName("RecentlyOpenedListSize").toInt(); - // Loop for each filepath in the recently opened list, remove non existing files and - // loop only as long as maximum allowed list entries are set. + // Loop for each filepath in the recently opened list, remove non existing files and + // loop only as long as maximum allowed list entries are set. for ( int i = 0; i < recentlyOpenedList.size() && i < recentlyOpenedListMaxSize; ) { - filePath = recentlyOpenedList.at(i); + filePath = recentlyOpenedList.at(i); QFileInfo fileInfo(filePath); - // If the file does no longer exist, remove it from the list. - if ( !fileInfo.exists() ) { - recentlyOpenedList.takeAt(i); + // If the file does no longer exist, remove it from the list. + if ( !fileInfo.exists() ) { + recentlyOpenedList.takeAt(i); if ( i < recentlyOpenedActionList.size()-2 ) { QAction* action = recentlyOpenedActionList.takeAt(i); delete action; } - } + } // else if its not already in the menu, add it to the menu. else { if ( i >= recentlyOpenedActionList.size()-2 ) { @@ -1274,14 +1270,14 @@ } i++; } - } + } - // Trim the list to its in the settings allowed maximum size. - while ( recentlyOpenedList.size() > recentlyOpenedListMaxSize ) { - recentlyOpenedList.takeLast(); + // Trim the list to its in the settings allowed maximum size. + while ( recentlyOpenedList.size() > recentlyOpenedListMaxSize ) { + recentlyOpenedList.takeLast(); QAction* action = recentlyOpenedActionList.takeAt( recentlyOpenedActionList.size()-3 ); delete action; - } + } // Add all actions to the menu. menuRecently_Opened_Files->addActions(recentlyOpenedActionList); @@ -1307,10 +1303,10 @@ QList<QAction*> recentlyOpenedActionList = menuRecently_Opened_Files->actions(); while ( recentlyOpenedList.size() > 0 ) { - recentlyOpenedList.takeLast(); + recentlyOpenedList.takeLast(); QAction* action = recentlyOpenedActionList.takeAt( recentlyOpenedActionList.size()-3 ); delete action; - } + } // Write the new recently opened list to the settings. settings->setValueByName( "LastOpenedFiles", recentlyOpenedList.join("|") ); @@ -1336,21 +1332,21 @@ int indexOfSelectedFile = menuRecently_Opened_Files->actions().indexOf( recentlyOpenedAction ); QStringList recentlyOpenedList = settings->getValueByName("LastOpenedFiles").toString().split("|"); QString filePath = recentlyOpenedList.at(indexOfSelectedFile); - QFileInfo fileInfo(filePath); + QFileInfo fileInfo(filePath); - // If the file exists, open it. - if ( fileInfo.exists() ) { - openSourceFileDialog(filePath); - } - // If it does not exist, show a warning message and update the list of recently opened files. - else { - QMessageBox::warning(NULL, tr("File no longer exists"), tr("The file %1 in the list of recently opened files does no longer exist.") ); + // If the file exists, open it. + if ( fileInfo.exists() ) { + openSourceFileDialog(filePath); + } + // If it does not exist, show a warning message and update the list of recently opened files. + else { + QMessageBox::warning(NULL, tr("File no longer exists"), tr("The file %1 in the list of recently opened files does no longer exist.") ); // The function updateRecentlyOpenedList() has to be called via a singleShot so it is executed after this // function (openFileFromRecentlyOpenedList) has already been left. This has to be done because // a Qt3Support function tries to emit a signal based on the existing actions and deleting // any of these actions in updateRecentlyOpenedList() causes an error. - QTimer::singleShot(0, this, SLOT(updateRecentlyOpenedList()) ); - } + QTimer::singleShot(0, this, SLOT(updateRecentlyOpenedList()) ); + } } @@ -1381,10 +1377,10 @@ \brief If the dropped in object contains urls/paths to a file, open that file. */ void MainWindow::showAboutDialog() { - QPixmap originalPixmap = QPixmap::grabWindow(QApplication::desktop()->screen()->winId()); - //qDebug("in main pixmap width %d, numScreens = %d", originalPixmap.size().width(), QApplication::desktop()->availableGeometry().width()); - aboutDialogGraphicsView->setScreenshotPixmap( originalPixmap ); - aboutDialogGraphicsView->show(); + QPixmap originalPixmap = QPixmap::grabWindow(QApplication::desktop()->screen()->winId()); + //qDebug("in main pixmap width %d, numScreens = %d", originalPixmap.size().width(), QApplication::desktop()->availableGeometry().width()); + aboutDialogGraphicsView->setScreenshotPixmap( originalPixmap ); + aboutDialogGraphicsView->show(); }
--- a/src/templateBatchScript.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/templateBatchScript.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -24,9 +24,9 @@ /*! \brief The only and static function of this class returns a batch or shell script - as string that can be used to call an indenter with the current settings from + as string that can be used to call an indenter with the current settings from the command line. - + The returned string contains some placeholders where the indenter name needs to be filled in. The placeholders are "__INDENTERCALLSTRING1__" that should be replaced by the indenter call string that indents a complete directory. @@ -36,65 +36,65 @@ const char* TemplateBatchScript::getTemplateBatchScript() { static const char* templateBatchScript = #if defined(Q_OS_WIN32) - "@echo off\n" - "\n" - "IF (%1)==() GOTO error\n" - "dir /b /ad %1 >nul 2>nul && GOTO indentDir\n" - "IF NOT EXIST %1 GOTO error\n" - "goto indentFile\n" - "\n" - ":indentDir\n" - "set searchdir=%1\n" - "\n" - "IF (%2)==() GOTO assignDefaultSuffix\n" - "set filesuffix=%2\n" - "\n" - "GOTO run\n" - "\n" - ":assignDefaultSuffix\n" - "::echo !!!!DEFAULT SUFFIX!!!\n" - "set filesuffix=*\n" - "\n" - ":run\n" - "FOR /F \"tokens=*\" %%G IN ('DIR /B /S %searchdir%\\*.%filesuffix%') DO (\n" + "@echo off\n" + "\n" + "IF (%1)==() GOTO error\n" + "dir /b /ad %1 >nul 2>nul && GOTO indentDir\n" + "IF NOT EXIST %1 GOTO error\n" + "goto indentFile\n" + "\n" + ":indentDir\n" + "set searchdir=%1\n" + "\n" + "IF (%2)==() GOTO assignDefaultSuffix\n" + "set filesuffix=%2\n" + "\n" + "GOTO run\n" + "\n" + ":assignDefaultSuffix\n" + "::echo !!!!DEFAULT SUFFIX!!!\n" + "set filesuffix=*\n" + "\n" + ":run\n" + "FOR /F \"tokens=*\" %%G IN ('DIR /B /S %searchdir%\\*.%filesuffix%') DO (\n" "echo Indenting file \"%%G\"\n" "__INDENTERCALLSTRING1__\n" - ")\n" - "GOTO ende\n" - "\n" - ":indentFile\n" - "echo Indenting one file %1\n" - "__INDENTERCALLSTRING2__\n" - "\n" - "GOTO ende\n" - "\n" - ":error\n" - "echo .\n" - "echo ERROR: As parameter given directory or file does not exist!\n" - "echo Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ dirname filesuffix\n" - "echo Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ filename\n" - "echo Example: recurse.bat temp cpp\n" - "echo .\n" - "\n" - ":ende\n"; + ")\n" + "GOTO ende\n" + "\n" + ":indentFile\n" + "echo Indenting one file %1\n" + "__INDENTERCALLSTRING2__\n" + "\n" + "GOTO ende\n" + "\n" + ":error\n" + "echo .\n" + "echo ERROR: As parameter given directory or file does not exist!\n" + "echo Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ dirname filesuffix\n" + "echo Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ filename\n" + "echo Example: recurse.bat temp cpp\n" + "echo .\n" + "\n" + ":ende\n"; #else - "#!/bin/sh \n" - "\n" - "if [ ! -n \"$1\" ]; then\n" + "#!/bin/sh \n" + "\n" + "if [ ! -n \"$1\" ]; then\n" "echo \"Syntax is: recurse.sh dirname filesuffix\"\n" "echo \"Syntax is: recurse.sh filename\"\n" "echo \"Example: recurse.sh temp cpp\"\n" "exit 1\n" - "fi\n" - "\n" - "if [ -d \"$1\" ]; then\n" + "fi\n" + "\n" + "if [ -d \"$1\" ]; then\n" "#echo \"Dir ${1} exists\"\n" "if [ -n \"$2\" ]; then\n" - "filesuffix=$2\n" + "filesuffix=$2\n" "else\n" - "filesuffix=\"*\"\n" + "filesuffix=\"*\"\n" "fi\n" "\n" "#echo \"Filtering files using suffix ${filesuffix}\"\n" @@ -102,21 +102,21 @@ "file_list=`find ${1} -name \"*.${filesuffix}\" -type f`\n" "for file2indent in $file_list\n" "do \n" - "echo \"Indenting file $file2indent\"\n" - "__INDENTERCALLSTRING1__\n" + "echo \"Indenting file $file2indent\"\n" + "__INDENTERCALLSTRING1__\n" "done\n" - "else\n" + "else\n" "if [ -f \"$1\" ]; then\n" - "echo \"Indenting one file $1\"\n" - "__INDENTERCALLSTRING2__\n" + "echo \"Indenting one file $1\"\n" + "__INDENTERCALLSTRING2__\n" "else\n" - "echo \"ERROR: As parameter given directory or file does not exist!\"\n" - "echo \"Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ dirname filesuffix\"\n" - "echo \"Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ filename\"\n" - "echo \"Example: recurse.sh temp cpp\"\n" - "exit 1\n" + "echo \"ERROR: As parameter given directory or file does not exist!\"\n" + "echo \"Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ dirname filesuffix\"\n" + "echo \"Syntax is: __INDENTERCALLSTRINGSCRIPTNAME__ filename\"\n" + "echo \"Example: recurse.sh temp cpp\"\n" + "exit 1\n" "fi\n" - "fi\n"; + "fi\n"; #endif // #if defined(Q_OS_WIN32) return templateBatchScript; } @@ -146,7 +146,7 @@ FOR /F "tokens=*" %%G IN ('DIR /B /S %searchdir%\*.%filesuffix%') DO ( echo Indenting file "%%G" ::call call_CSSTidy.bat "%%G" - "C:/Dokumente und Einstellungen/ts/Eigene Dateien/Visual Studio 2005/Projects/UiGuixy/indenters/csstidy.exe" "%%G" --timestamp=true --allow_html_in_templates=false --compress_colors=true --compress_font=true --lowercase_s=false --preserve_css=false --remove_last_;=false --remove_bslash=true --sort_properties=false --sort_selectors=false indentoutput.css + "C:/Dokumente und Einstellungen/ts/Eigene Dateien/Visual Studio 2005/Projects/UiGuixy/indenters/csstidy.exe" "%%G" --timestamp=true --allow_html_in_templates=false --compress_colors=true --compress_font=true --lowercase_s=false --preserve_css=false --remove_last_;=false --remove_bslash=true --sort_properties=false --sort_selectors=false indentoutput.css move /Y indentoutput.css "%%G" ) GOTO ende
--- a/src/uiguiIniFileParser.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/uiguiIniFileParser.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -27,11 +27,11 @@ \class UiguiIniFileParser \ingroup grp_Settings \brief UiguiIniFileParser is a simple ini file format parser. - + These ini files need to have key-value pairs in the style "keyname=keyvalue". Groups can be defined by writing the groupname in the style [groupname] before some key-value pairs. - + The reason why I use my own class instead of QSettings is mainly, that QSettings always internally sorts the groups alphabetically and also rewrites a settings file sorted. Very annoying for me. @@ -73,7 +73,7 @@ for( unsigned int i = 0; i < sections.size(); i++ ) { sectionsStringList << sections[i]; - } + } return sectionsStringList; } @@ -89,7 +89,7 @@ */ QVariant UiguiIniFileParser::value(const QString &keyName, const QString &defaultValue) { - return keyValueMap.value( keyName, defaultValue ); + return keyValueMap.value( keyName, defaultValue ); } @@ -113,7 +113,7 @@ while ( !iniFileStream.atEnd() ) { line = iniFileStream.readLine().trimmed(); - + // Test if the read line is a section name and if so remeber it. if ( line.startsWith("[") && line.endsWith("]") ) { currentSectionName = line.remove(0, 1);
--- a/src/uiguierrormessage.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/uiguierrormessage.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -30,9 +30,9 @@ /*! \brief Initializes the dialog. - + Retrieves the object pointer to the \a showAgainCheckBox check box, sets the dialogs - modality and for a working translation sets the check box text. + modality and for a working translation sets the check box text. */ UiguiErrorMessage::UiguiErrorMessage(QWidget *parent) : QErrorMessage(parent) { showAgainCheckBox = findChild<QCheckBox *>(); @@ -50,7 +50,7 @@ /*! \brief Shows an error \a message in a dialog box with \a title. - + The shown \a message is added to a list, if not already in there. If it is already in that list and "Show this message again" is not checked, that message will not be shown.
--- a/src/uiguisettings.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/uiguisettings.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -24,25 +24,25 @@ //! \defgroup grp_Settings All concerning the settings. /*! - \class UiguiSettings + \class UiguiSettings \ingroup grp_Settings - \brief Handles the settings of the program. Reads them on startup and saves them on exit. + \brief Handles the settings of the program. Reads them on startup and saves them on exit. Is a singleton class and can only be accessed via getInstance(). */ // Inits the single class instance pointer. - UiguiSettings* UiguiSettings::instance = NULL; +UiguiSettings* UiguiSettings::instance = NULL; /*! - \brief The constructor for the settings. + \brief The constructor for the settings. */ UiguiSettings::UiguiSettings() : QObject() { // Create the main application settings object from the UniversalIndentGUI.ini file. qsettings = new QSettings(SettingsPaths::getSettingsPath() + "/UniversalIndentGUI.ini", QSettings::IniFormat, this); indenterDirctoryStr = SettingsPaths::getGlobalFilesPath() + "/indenters"; - readAvailableTranslations(); - loadSettings(); + readAvailableTranslations(); + loadSettings(); } @@ -52,7 +52,7 @@ UiguiSettings* UiguiSettings::getInstance() { if ( instance == NULL ) { // Create the settings object, which loads all UiGui settings from a file. - instance = new UiguiSettings(); + instance = new UiguiSettings(); } return instance; @@ -76,37 +76,37 @@ /*! - \brief Scans the translations directory for available translation files and + \brief Scans the translations directory for available translation files and stores them in the QList \a availableTranslations. */ void UiguiSettings::readAvailableTranslations() { - QString languageShort; - QStringList languageFileList; + QString languageShort; + QStringList languageFileList; - // English is the default language. A translation file does not exist but to have a menu entry, added here. - languageFileList << "universalindent_en.qm"; + // English is the default language. A translation file does not exist but to have a menu entry, added here. + languageFileList << "universalindent_en.qm"; - // Find all translation files in the "translations" directory. - QDir translationDirectory = QDir( SettingsPaths::getGlobalFilesPath() + "/translations" ); - languageFileList << translationDirectory.entryList( QStringList("universalindent_*.qm") ); + // Find all translation files in the "translations" directory. + QDir translationDirectory = QDir( SettingsPaths::getGlobalFilesPath() + "/translations" ); + languageFileList << translationDirectory.entryList( QStringList("universalindent_*.qm") ); - // Loop for each found translation file - foreach ( languageShort, languageFileList ) { - // Remove the leading string "universalindent_" from the filename. - languageShort.remove(0,16); - // Remove trailing file extension ".qm". - languageShort.chop(3); + // Loop for each found translation file + foreach ( languageShort, languageFileList ) { + // Remove the leading string "universalindent_" from the filename. + languageShort.remove(0,16); + // Remove trailing file extension ".qm". + languageShort.chop(3); - availableTranslations.append(languageShort); - } + availableTranslations.append(languageShort); + } } /*! - \brief Returns a list of the mnemonics of the available translations. + \brief Returns a list of the mnemonics of the available translations. */ QStringList UiguiSettings::getAvailableTranslations() { - return availableTranslations; + return availableTranslations; } @@ -203,29 +203,29 @@ /*! - \brief Sets the value of the by \a settingsName defined setting to the value \a value. + \brief Sets the value of the by \a settingsName defined setting to the value \a value. The to \a settingsName corresponding signal is emitted, if the value has changed. */ bool UiguiSettings::setValueByName(QString settingName, QVariant value) { - // Test if the named setting really exists. - if ( settings.contains(settingName) ) { + // Test if the named setting really exists. + if ( settings.contains(settingName) ) { // Test if the new value is different to the one before. if ( settings[settingName] != value ) { // Set the new value. - settings[settingName] = value; + settings[settingName] = value; // Emit the signal for the changed setting. emitSignalForSetting(settingName); } - return true; - } + return true; + } return false; } /*! - \brief Emits the correct signal for the given \a settingName. - + \brief Emits the correct signal for the given \a settingName. + If \a settingName equals "all", all signals are emitted. This can be used to update all dependent widgets. \a value is the new value that is emitted along with the signal. */ @@ -280,66 +280,66 @@ /*! - \brief Returns the value of the by \a settingsName defined setting as QVariant. + \brief Returns the value of the by \a settingsName defined setting as QVariant. - If the named setting does not exist, 0 is being returned. + If the named setting does not exist, 0 is being returned. */ QVariant UiguiSettings::getValueByName(QString settingName) { - // Test if the named setting really exists. - if ( settings.contains(settingName) ) { - return settings[settingName]; - } - return QVariant(0); + // Test if the named setting really exists. + if ( settings.contains(settingName) ) { + return settings[settingName]; + } + return QVariant(0); } /*! \brief Loads the settings for the main application. - Settings are for example last selected indenter, last loaded source code file and so on. + Settings are for example last selected indenter, last loaded source code file and so on. */ bool UiguiSettings::loadSettings() { - // Read the version string saved in the settings file. - settings["VersionInSettingsFile"] = qsettings->value("UniversalIndentGUI/version", "").toString(); + // Read the version string saved in the settings file. + settings["VersionInSettingsFile"] = qsettings->value("UniversalIndentGUI/version", "").toString(); - // Read windows last size and position from the settings file. - settings["WindowIsMaximized"] = qsettings->value("UniversalIndentGUI/maximized", false).toBool(); - settings["WindowPosition"] = qsettings->value("UniversalIndentGUI/position", QPoint(50, 50)).toPoint(); - settings["WindowSize"] = qsettings->value("UniversalIndentGUI/size", QSize(800, 600)).toSize(); + // Read windows last size and position from the settings file. + settings["WindowIsMaximized"] = qsettings->value("UniversalIndentGUI/maximized", false).toBool(); + settings["WindowPosition"] = qsettings->value("UniversalIndentGUI/position", QPoint(50, 50)).toPoint(); + settings["WindowSize"] = qsettings->value("UniversalIndentGUI/size", QSize(800, 600)).toSize(); - // Read last selected encoding for the opened source code file. - settings["FileEncoding"] = qsettings->value("UniversalIndentGUI/encoding", "UTF-8").toString(); + // Read last selected encoding for the opened source code file. + settings["FileEncoding"] = qsettings->value("UniversalIndentGUI/encoding", "UTF-8").toString(); // Read maximum length of list for recently opened files. - settings["RecentlyOpenedListSize"] = qsettings->value("UniversalIndentGUI/recentlyOpenedListSize", 5).toInt(); + settings["RecentlyOpenedListSize"] = qsettings->value("UniversalIndentGUI/recentlyOpenedListSize", 5).toInt(); - // Read if last opened source code file should be loaded on startup. - settings["LoadLastOpenedFileOnStartup"] = qsettings->value("UniversalIndentGUI/loadLastSourceCodeFileOnStartup", true).toBool(); + // Read if last opened source code file should be loaded on startup. + settings["LoadLastOpenedFileOnStartup"] = qsettings->value("UniversalIndentGUI/loadLastSourceCodeFileOnStartup", true).toBool(); - // Read last opened source code file from the settings file. - settings["LastOpenedFiles"] = qsettings->value("UniversalIndentGUI/lastSourceCodeFile", indenterDirctoryStr+"/example.cpp").toString(); + // Read last opened source code file from the settings file. + settings["LastOpenedFiles"] = qsettings->value("UniversalIndentGUI/lastSourceCodeFile", indenterDirctoryStr+"/example.cpp").toString(); - // Read last selected indenter from the settings file. - int SelectedIndenter = qsettings->value("UniversalIndentGUI/selectedIndenter", 0).toInt(); - if ( SelectedIndenter < 0 ) { - SelectedIndenter = 0; - } - settings["SelectedIndenter"] = SelectedIndenter; + // Read last selected indenter from the settings file. + int SelectedIndenter = qsettings->value("UniversalIndentGUI/selectedIndenter", 0).toInt(); + if ( SelectedIndenter < 0 ) { + SelectedIndenter = 0; + } + settings["SelectedIndenter"] = SelectedIndenter; // Read if syntax highlighting is enabled. - settings["SyntaxHighlightningEnabled"] = qsettings->value("UniversalIndentGUI/SyntaxHighlightningEnabled", true).toBool(); + settings["SyntaxHighlightningEnabled"] = qsettings->value("UniversalIndentGUI/SyntaxHighlightningEnabled", true).toBool(); - // Read if white space characters should be displayed. - settings["WhiteSpaceIsVisible"] = qsettings->value("UniversalIndentGUI/whiteSpaceIsVisible", false).toBool(); + // Read if white space characters should be displayed. + settings["WhiteSpaceIsVisible"] = qsettings->value("UniversalIndentGUI/whiteSpaceIsVisible", false).toBool(); - // Read if indenter parameter tool tips are enabled. - settings["IndenterParameterTooltipsEnabled"] = qsettings->value("UniversalIndentGUI/indenterParameterTooltipsEnabled", true).toBool(); + // Read if indenter parameter tool tips are enabled. + settings["IndenterParameterTooltipsEnabled"] = qsettings->value("UniversalIndentGUI/indenterParameterTooltipsEnabled", true).toBool(); - // Read the tab width from the settings file. - settings["TabWidth"] = qsettings->value("UniversalIndentGUI/tabWidth", 4).toInt(); + // Read the tab width from the settings file. + settings["TabWidth"] = qsettings->value("UniversalIndentGUI/tabWidth", 4).toInt(); - // Read the last selected language and stores the index it has in the list of available translations. - settings["Language"] = availableTranslations.indexOf( qsettings->value("UniversalIndentGUI/language", "").toString() ); + // Read the last selected language and stores the index it has in the list of available translations. + settings["Language"] = availableTranslations.indexOf( qsettings->value("UniversalIndentGUI/language", "").toString() ); // Read the update check settings from the settings file. settings["CheckForUpdate"] = qsettings->value("UniversalIndentGUI/CheckForUpdate", true).toBool(); @@ -348,7 +348,7 @@ // Read the main window state. settings["MainWindowState"] = qsettings->value("UniversalIndentGUI/MainWindowState", QByteArray()).toByteArray(); - return true; + return true; } @@ -358,19 +358,19 @@ Settings are for example last selected indenter, last loaded source code file and so on. */ bool UiguiSettings::saveSettings() { - qsettings->setValue( "UniversalIndentGUI/recentlyOpenedListSize", settings["RecentlyOpenedListSize"] ); + qsettings->setValue( "UniversalIndentGUI/recentlyOpenedListSize", settings["RecentlyOpenedListSize"] ); qsettings->setValue( "UniversalIndentGUI/lastSourceCodeFile", settings["LastOpenedFiles"] ); - qsettings->setValue( "UniversalIndentGUI/loadLastSourceCodeFileOnStartup", settings["LoadLastOpenedFileOnStartup"] ); + qsettings->setValue( "UniversalIndentGUI/loadLastSourceCodeFileOnStartup", settings["LoadLastOpenedFileOnStartup"] ); qsettings->setValue( "UniversalIndentGUI/selectedIndenter", settings["SelectedIndenter"] ); qsettings->setValue( "UniversalIndentGUI/indenterParameterTooltipsEnabled", settings["IndenterParameterTooltipsEnabled"] ); qsettings->setValue( "UniversalIndentGUI/language", availableTranslations[ settings["Language"].toInt() ] ); - qsettings->setValue( "UniversalIndentGUI/encoding", settings["FileEncoding"] ); + qsettings->setValue( "UniversalIndentGUI/encoding", settings["FileEncoding"] ); qsettings->setValue( "UniversalIndentGUI/version", settings["VersionInSettingsFile"] ); - qsettings->setValue( "UniversalIndentGUI/maximized", settings["WindowIsMaximized"] ); - if ( !settings["WindowIsMaximized"].toBool() ) { - qsettings->setValue( "UniversalIndentGUI/position", settings["WindowPosition"] ); - qsettings->setValue( "UniversalIndentGUI/size", settings["WindowSize"] ); - } + qsettings->setValue( "UniversalIndentGUI/maximized", settings["WindowIsMaximized"] ); + if ( !settings["WindowIsMaximized"].toBool() ) { + qsettings->setValue( "UniversalIndentGUI/position", settings["WindowPosition"] ); + qsettings->setValue( "UniversalIndentGUI/size", settings["WindowSize"] ); + } qsettings->setValue( "UniversalIndentGUI/SyntaxHighlightningEnabled", settings["SyntaxHighlightningEnabled"] ); qsettings->setValue( "UniversalIndentGUI/whiteSpaceIsVisible", settings["WhiteSpaceIsVisible"] ); qsettings->setValue( "UniversalIndentGUI/tabWidth", settings["TabWidth"] );
--- a/src/uiguisettingsdialog.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/uiguisettingsdialog.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -20,13 +20,13 @@ #include "uiguisettingsdialog.h" /*! - \class UiguiSettingsDialog + \class UiguiSettingsDialog \ingroup grp_Settings - \brief Displays a dialog window with settings for UniversalIndentGUI + \brief Displays a dialog window with settings for UniversalIndentGUI */ /*! - \brief The constructor calls the setup function for the ui created by uic. and adds + \brief The constructor calls the setup function for the ui created by uic. and adds */ UiguiSettingsDialog::UiguiSettingsDialog(QWidget* parent, UiguiSettings* settings) : QDialog(parent) { @@ -34,11 +34,11 @@ this->settings = settings; // Init the user interface created by the UIC. - setupUi(this); - - //TODO: This call has to be removed when the properties for the highlighters can be set + setupUi(this); + + //TODO: This call has to be removed when the properties for the highlighters can be set // with the settings dialog. - groupBoxSyntaxHighlighterProperties->setToolTip( "(Will be implemented soon)" + groupBoxSyntaxHighlighterProperties->toolTip() ); + groupBoxSyntaxHighlighterProperties->setToolTip( "(Will be implemented soon)" + groupBoxSyntaxHighlighterProperties->toolTip() ); // Get all check boxes that are used for settings. checkBoxes = findChildren<QCheckBox*>( QRegExp("uiGui*") ); @@ -52,39 +52,39 @@ // Connect the accepted signal to own function, to write values back to the UiguiSettings object. connect(this, SIGNAL(accepted()), this, SLOT(writeWidgetValuesToSettings()) ); - // Init the language selection combobox. - initTranslationSelection(); + // Init the language selection combobox. + initTranslationSelection(); } /*! - \brief By calling this function the combobox for selecting the application language will - be initialized. - + \brief By calling this function the combobox for selecting the application language will + be initialized. + Also the translation itself will be reinitialized. */ void UiguiSettingsDialog::initTranslationSelection() { - // First empty the combo box. - uiGuiLanguageSelectionComboBox->clear(); - - // Now add an entry into the box for every language short. - foreach (QString languageShort, settings->getAvailableTranslations() ) { - // Identify the language mnemonic and set the full name. - if ( languageShort == "en" ) { - uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("English") ); - } + // First empty the combo box. + uiGuiLanguageSelectionComboBox->clear(); + + // Now add an entry into the box for every language short. + foreach (QString languageShort, settings->getAvailableTranslations() ) { + // Identify the language mnemonic and set the full name. + if ( languageShort == "en" ) { + uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("English") ); + } else if ( languageShort == "fr" ) { uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("French") ); } - else if ( languageShort == "de" ) { - uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("German") ); - } - else if ( languageShort == "zh_TW" ) { - uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("Chinese (Taiwan)") ); - } - else if ( languageShort == "ja_jp" ) { - uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("Japanese") ); - } + else if ( languageShort == "de" ) { + uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("German") ); + } + else if ( languageShort == "zh_TW" ) { + uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("Chinese (Taiwan)") ); + } + else if ( languageShort == "ja_jp" ) { + uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("Japanese") ); + } else if ( languageShort == "ru" ) { uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("Russian") ); } @@ -92,16 +92,16 @@ uiGuiLanguageSelectionComboBox->addItem( QIcon(QString(":/language/language-"+languageShort+".png")), tr("Ukrainian") ); } - else { - uiGuiLanguageSelectionComboBox->addItem( tr("Unknown language mnemonic ") + languageShort ); - } - } + else { + uiGuiLanguageSelectionComboBox->addItem( tr("Unknown language mnemonic ") + languageShort ); + } + } } /*! - \brief Displays the dialog by calling the dialogs exec function. - + \brief Displays the dialog by calling the dialogs exec function. + Before it gets all the values needed from the UiguiSettings object. */ int UiguiSettingsDialog::showDialog() { @@ -220,8 +220,8 @@ // If this is not explicit set here, Qt < 4.3.0 does not translate the buttons. buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok); - //TODO: This has to be removed when the properties for the highlighters can be set. - groupBoxSyntaxHighlighterProperties->setToolTip( "(Will be implemented soon)" + groupBoxSyntaxHighlighterProperties->toolTip() ); + //TODO: This has to be removed when the properties for the highlighters can be set. + groupBoxSyntaxHighlighterProperties->setToolTip( "(Will be implemented soon)" + groupBoxSyntaxHighlighterProperties->toolTip() ); QStringList languageShortList = settings->getAvailableTranslations(); @@ -255,7 +255,7 @@ uiGuiLanguageSelectionComboBox->setItemText( i, tr("Unknown language mnemonic ") + languageShort ); } } - } + } else { QWidget::changeEvent(event); }
--- a/src/updatecheckdialog.cpp Tue Nov 11 09:59:57 2008 +0000 +++ b/src/updatecheckdialog.cpp Tue Nov 11 11:12:36 2008 +0000 @@ -95,8 +95,8 @@ /*! \brief This slot is called after the update check has returned, either by successfully retrieving the pad file, or on any kind of network error. - - Shows a message if check was successful or not. Offers the user to go to the + + Shows a message if check was successful or not. Offers the user to go to the download page if a newer version exists. In case of an error during update check, a message box with the error will be displayed. */ @@ -112,7 +112,6 @@ // If the version string could be found in the returned string, show an update dialog and set last update check date. if ( leftPosition != -1 && rightPosition != -1 ) { - // Get the pure version string from returned string. returnedString = returnedString.mid( leftPosition+17, rightPosition-(leftPosition+17) ); @@ -244,7 +243,7 @@ \brief Converts the as string given version \a versionString to an integer number. The \a versionString must have the format x.x.x where each x represents a number - of a maximum of 999. If the input format is wrong, -1 will be returned.The first + of a maximum of 999. If the input format is wrong, -1 will be returned.The first number will be multiplied by 1000000 the second by 1000 and then all three will be summarized.