Added first part of UiGuiSettings class.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 2 years ago
parent d879569fce
commit e7b18a1f57
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -39,6 +39,7 @@ set( ${target}_SRCS
AboutDialog.cpp AboutDialog.cpp
MainWindow.cpp MainWindow.cpp
main.cpp main.cpp
UiGuiSettings.cpp
) )
tde_add_executable( ${target} AUTOMOC tde_add_executable( ${target} AUTOMOC

@ -19,19 +19,19 @@
#include "config.h" #include "config.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "UiGuiVersion.h"
///-- #include "debugging/TSLogger.h" ///-- #include "debugging/TSLogger.h"
///-- #include "SettingsPaths.h"
///--
#include "ToolBarWidget.h"
#include "AboutDialog.h" #include "AboutDialog.h"
#include "SettingsPaths.h"
#include "UiGuiSettings.h"
#include "UiGuiVersion.h"
#include "ToolBarWidget.h"
///-- #include "AboutDialogGraphicsView.h" ///-- #include "AboutDialogGraphicsView.h"
///-- #include "UiGuiSettings.h"
///-- #include "UiGuiSettingsDialog.h" ///-- #include "UiGuiSettingsDialog.h"
///-- #include "UiGuiHighlighter.h" ///-- #include "UiGuiHighlighter.h"
///-- #include "IndentHandler.h" ///-- #include "IndentHandler.h"
///--
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqaction.h> #include <tqaction.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -89,9 +89,9 @@ MainWindow::MainWindow(TQString file2OpenOnStart, TQWidget *parent) :
///-- // Init of some variables. ///-- // Init of some variables.
///-- _sourceCodeChanged = false; ///-- _sourceCodeChanged = false;
///-- _scrollPositionChanged = false; ///-- _scrollPositionChanged = false;
///--
///-- // Create the _settings object, which loads all UiGui settings from a file. // Create the _settings object, which loads all UiGui settings from a file.
///-- _settings = UiGuiSettings::getInstance(); m_settings = UiGuiSettings::getInstance();
///-- ///--
///-- // Initialize the language of the application. ///-- // Initialize the language of the application.
///-- initApplicationLanguage(); ///-- initApplicationLanguage();

@ -23,13 +23,13 @@
#include "MainWindowBase.h" #include "MainWindowBase.h"
#include "tqobjdefs.h" #include "tqobjdefs.h"
/// #include "UiGuiSettings.h"
///
/// class UiGuiSettingsDialog; /// class UiGuiSettingsDialog;
class AboutDialog; class AboutDialog;
/// class AboutDialogGraphicsView; /// class AboutDialogGraphicsView;
/// class UiGuiHighlighter; /// class UiGuiHighlighter;
/// class IndentHandler /// class IndentHandler
class UiGuiSettings;
class ToolBarWidget; class ToolBarWidget;
/// ///
/// class TQLabel; /// class TQLabel;
@ -97,7 +97,7 @@ class MainWindow : public MainWindowBase
///-- void dropEvent(TQDropEvent *event); ///-- void dropEvent(TQDropEvent *event);
///-- ///--
///-- QsciScintilla *_qSciSourceCodeEditor; ///-- QsciScintilla *_qSciSourceCodeEditor;
///-- TQSharedPointer<UiGuiSettings> _settings; UiGuiSettings *m_settings;
///-- ///--
///-- TQString _currentEncoding; ///-- TQString _currentEncoding;
///-- TQString _sourceFileContent; ///-- TQString _sourceFileContent;

@ -18,86 +18,86 @@
***************************************************************************/ ***************************************************************************/
#include "UiGuiSettings.h" #include "UiGuiSettings.h"
#include "SettingsPaths.h" #include "SettingsPaths.h"
#include <tqsettings.h> #include <tqdatetime.h>
#include <tqdir.h>
#include <tqpoint.h> #include <tqpoint.h>
#include <tqsettings.h>
#include <tqsize.h> #include <tqsize.h>
#include <tqdir.h>
#include <tqdate.h>
#include <tqstringlist.h>
#include <tqcoreapplication.h>
#include <tqmetamethod.h>
#include <tqmetaproperty.h>
#include <tqwidget.h> #include <tqwidget.h>
//! \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(). Is a singleton class and can only be accessed via getInstance().
*/ */
// Inits the single class instance pointer. // Inits the single class instance pointer.
TQWeakPointer<UiGuiSettings> UiGuiSettings::_instance; UiGuiSettings *UiGuiSettings::m_instance = nullptr;
/*! /*
\brief The constructor for the settings. \brief The constructor for the settings.
*/ */
UiGuiSettings::UiGuiSettings() : UiGuiSettings::UiGuiSettings() : TQObject()
TQObject() {
{ // Create the main application settings object from the UniversalIndentGUIrc file.
// Create the main application settings object from the UniversalIndentGUI.ini file. m_qsettings = new TQSettings(TQSettings::Ini);
_qsettings = new TQSettings( // The next lines make user the settings are always stored in
SettingsPaths::getSettingsPath() + "/UniversalIndentGUI.ini", TQSettings::IniFormat, this); // $HOME/.universalindentgui/universalindentguirc
m_qsettings->insertSearchPath(TQSettings::Unix, SettingsPaths::getSettingsPath());
_indenterDirctoryStr = SettingsPaths::getGlobalFilesPath() + "/indenters"; m_qsettings->setPath("UniversalIndentGUI", "UniversalIndentGUI", TQSettings::User);
// settings are stored in the universalindentguirc file, group UniversalIndentGUI
m_qsettings->beginGroup("universalindentgui/UniversalIndentGUI");
m_indenterDirectoryStr = SettingsPaths::getGlobalFilesPath() + "/indenters";
readAvailableTranslations(); readAvailableTranslations();
initSettings(); loadSettings();
} }
/*! /*
\brief Returns the instance of the settings class. If no instance exists, ONE will be created. \brief Returns the instance of the settings class. If no instance exists, one will be created.
*/ */
TQSharedPointer<UiGuiSettings> UiGuiSettings::getInstance() UiGuiSettings* UiGuiSettings::getInstance()
{ {
TQSharedPointer<UiGuiSettings> sharedInstance = _instance.toStrongRef(); if (!m_instance)
if (sharedInstance.isNull())
{ {
// Create the settings object, which loads all UiGui settings from a file. // Create the settings object, which loads all UiGui settings from a file.
sharedInstance = TQSharedPointer<UiGuiSettings>(new UiGuiSettings()); m_instance = new UiGuiSettings();
_instance = sharedInstance.toWeakRef();
} }
return sharedInstance; return m_instance;
} }
/*! /*
\brief The destructor saves the settings to a file. \brief Deletes the existing instance of UiGuiSettings and removes the created temp dir.
*/ */
UiGuiSettings::~UiGuiSettings() void UiGuiSettings::deleteInstance()
{ {
// Convert the language setting from an integer index to a string. SettingsPaths::cleanAndRemoveTempDir();
int index = _qsettings->value("UniversalIndentGUI/language", 0).toInt(); if (m_instance)
if (index < 0 || index >= _availableTranslations.size())
{ {
index = 0; delete m_instance;
m_instance = nullptr;
}
} }
_qsettings->setValue("UniversalIndentGUI/language", _availableTranslations.at(index)); /*
\brief The destructor saves the settings to a file.
*/
UiGuiSettings::~UiGuiSettings()
{
saveSettings();
delete m_qsettings;
} }
/*! /*
\brief Scans the translations directory for available translation files and \brief Scans the translations directory for available translation files and
stores them in the TQList \a _availableTranslations. stores them in the TQList \a m_availableTranslations.
*/ */
void UiGuiSettings::readAvailableTranslations() void UiGuiSettings::readAvailableTranslations()
{ {
TQString languageShort;
TQStringList languageFileList; TQStringList languageFileList;
// English is the default language. A translation file does not exist but to have a menu entry, // English is the default language. A translation file does not exist but to have a menu entry,
@ -106,36 +106,66 @@ void UiGuiSettings::readAvailableTranslations()
// Find all translation files in the "translations" directory. // Find all translation files in the "translations" directory.
TQDir translationDirectory = TQDir(SettingsPaths::getGlobalFilesPath() + "/translations"); TQDir translationDirectory = TQDir(SettingsPaths::getGlobalFilesPath() + "/translations");
languageFileList << translationDirectory.entryList(TQStringList("universalindent_*.qm")); for (TQString &file : translationDirectory.entryList(TQString("universalindent_*.qm")))
{
languageFileList << file;
}
// Loop for each found translation file // Loop for each found translation file
foreach(languageShort, languageFileList) for (TQString &languageShort : languageFileList)
{ {
// Remove the leading string "universalindent_" from the filename. // Remove the leading string "universalindent_" from the filename.
languageShort.remove(0, 16); languageShort.remove(0, 16);
// Remove trailing file extension ".qm". // Remove trailing file extension ".qm".
languageShort.chop(3); languageShort.truncate(languageShort.length() - 3);
_availableTranslations.append(languageShort); m_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.
*/ */
TQStringList UiGuiSettings::getAvailableTranslations() TQStringList& UiGuiSettings::getAvailableTranslations()
{ {
return _availableTranslations; return m_availableTranslations;
} }
/*! /*
\brief Returns the value of the by \a settingsName defined setting as TQVariant. \brief Returns the value of the by \a settingsName defined setting as TQVariant.
If the named setting does not exist, 0 is being returned. If the named setting does not exist, 0 is being returned.
*/ */
TQVariant UiGuiSettings::getValueByName(TQString settingName) TQVariant UiGuiSettings::getValueByName(const TQString &settingName) const
{
// Test if the named setting really exists.
if (m_settings.contains(settingName))
{
return m_settings[settingName];
}
return TQVariant(0);
}
/*
\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(const TQString &settingName, TQVariant value)
{
// Test if the named setting really exists.
if (m_settings.contains(settingName))
{ {
return _qsettings->value("UniversalIndentGUI/" + settingName); // Test if the new value is different to the one before.
if (m_settings[settingName] != value)
{
m_settings[settingName] = value;
// Emit the signal for the changed setting.
emitSignalForSetting(settingName);
}
return true;
}
return false;
} }
/*! /*!
@ -143,75 +173,125 @@ TQVariant UiGuiSettings::getValueByName(TQString settingName)
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::initSettings() void UiGuiSettings::loadSettings()
{ {
// Read the version string saved in the settings file. // Read the version string saved in the settings file.
_qsettings->setValue("UniversalIndentGUI/version", m_settings["VersionInSettingsFile"] = m_qsettings->readEntry("version", TQString::null);
_qsettings->value("UniversalIndentGUI/version", ""));
// Read windows last size and position from the settings file. // Read windows last size and position from the settings file.
_qsettings->setValue("UniversalIndentGUI/maximized", m_settings["WindowIsMaximized"] = m_qsettings->readBoolEntry("maximized", false);
_qsettings->value("UniversalIndentGUI/maximized", false)); m_settings["WindowPosition"] = m_qsettings->readEntry("position", "@Point(50, 50)");
_qsettings->setValue("UniversalIndentGUI/position", m_settings["WindowSize"] = m_qsettings->readEntry("size", "@Size(800, 600)");
_qsettings->value("UniversalIndentGUI/position", TQPoint(50, 50)));
_qsettings->setValue("UniversalIndentGUI/size",
_qsettings->value("UniversalIndentGUI/size", TQSize(800, 600)));
// Read last selected encoding for the opened source code file. // Read last selected encoding for the opened source code file.
_qsettings->setValue("UniversalIndentGUI/encoding", m_settings["FileEncoding"] = m_qsettings->readEntry("encoding", "UTF-8");
_qsettings->value("UniversalIndentGUI/encoding", "UTF-8"));
// Read maximum length of list for recently opened files. // Read maximum length of list for recently opened files.
_qsettings->setValue("UniversalIndentGUI/recentlyOpenedListSize", m_settings["RecentlyOpenedListSize"] = m_qsettings->readNumEntry("recentlyOpenedListSize", 5);
_qsettings->value("UniversalIndentGUI/recentlyOpenedListSize", 5));
// Read if last opened source code file should be loaded on startup. // Read if last opened source code file should be loaded on startup.
_qsettings->setValue("UniversalIndentGUI/loadLastSourceCodeFileOnStartup", m_settings["LoadLastOpenedFileOnStartup"] = m_qsettings->readBoolEntry(
_qsettings->value("UniversalIndentGUI/loadLastSourceCodeFileOnStartup", true)); "loadLastSourceCodeFileOnStartup", true);
// Read last opened source code file from the settings file. // Read last opened source code file from the settings file.
_qsettings->setValue("UniversalIndentGUI/lastSourceCodeFile", m_settings["LastOpenedFiles"] = m_qsettings->readEntry("lastSourceCodeFile",
_qsettings->value("UniversalIndentGUI/lastSourceCodeFile", m_indenterDirectoryStr + "/example.cpp");
_indenterDirctoryStr + "/example.cpp"));
// Read last selected indenter from the settings file. // Read last selected indenter from the settings file.
int selectedIndenter = _qsettings->value("UniversalIndentGUI/selectedIndenter", 0).toInt(); int selectedIndenter = m_qsettings->readNumEntry("selectedIndenter", 0);
if (selectedIndenter < 0) if (selectedIndenter < 0)
{ {
selectedIndenter = 0; selectedIndenter = 0;
} }
_qsettings->setValue("UniversalIndentGUI/selectedIndenter", selectedIndenter); m_settings["SelectedIndenter"] = selectedIndenter;
// Read if syntax highlighting is enabled. // Read if syntax highlighting is enabled.
_qsettings->setValue("UniversalIndentGUI/SyntaxHighlightingEnabled", m_settings["SyntaxHighlightningEnabled"] = m_qsettings->readBoolEntry(
_qsettings->value("UniversalIndentGUI/SyntaxHighlightingEnabled", true)); "SyntaxHighlightningEnabled", true);
// Read if white space characters should be displayed. // Read if white space characters should be displayed.
_qsettings->setValue("UniversalIndentGUI/whiteSpaceIsVisible", m_settings["WhiteSpaceIsVisible"] = m_qsettings->readBoolEntry("whiteSpaceIsVisible", false);
_qsettings->value("UniversalIndentGUI/whiteSpaceIsVisible", false));
// Read if indenter parameter tool tips are enabled. // Read if indenter parameter tool tips are enabled.
_qsettings->setValue("UniversalIndentGUI/indenterParameterTooltipsEnabled", m_settings["IndenterParameterTooltipsEnabled"] = m_qsettings->readBoolEntry(
_qsettings->value("UniversalIndentGUI/indenterParameterTooltipsEnabled", true)); "indenterParameterTooltipsEnabled", true);
// Read the tab width from the settings file. // Read the tab width from the settings file.
_qsettings->setValue("UniversalIndentGUI/tabWidth", m_settings["TabWidth"] = m_qsettings->readNumEntry("tabWidth", 4);
_qsettings->value("UniversalIndentGUI/tabWidth", 4));
// Read the last selected language and stores the index it has in the list of available // Read the last selected language and stores the index it has in the list of available
// translations. // translations.
_qsettings->setValue("UniversalIndentGUI/language", TQString language = m_qsettings->readEntry("language", "en");
_availableTranslations.indexOf(_qsettings->value("UniversalIndentGUI/language", int idx = m_availableTranslations.findIndex(language);
"").toString())); if (idx < 0)
{
idx = m_availableTranslations.findIndex("en"); // "en" is always present
}
m_settings["Language"] = idx;
// TODO - MainWindow::saveState() missing in TQt3
// Read the main window state. // Read the main window state.
_qsettings->setValue("UniversalIndentGUI/MainWindowState", // m_settings["MainWindowState"] = m_qsettings->readEntry("MainWindowState", "@ByteArray()");
_qsettings->value("UniversalIndentGUI/MainWindowState", TQByteArray()));
return true;
} }
/*! /*!
\brief Saves the settings for the main application.
Settings are for example last selected indenter, last loaded source code file and so on.
*/
void UiGuiSettings::saveSettings()
{
// Write the version string saved in the settings file.
m_qsettings->writeEntry("version", m_settings["VersionInSettingsFile"].toString());
// Write windows last size and position from the settings file.
m_qsettings->writeEntry("maximized", m_settings["WindowIsMaximized"].toBool());
m_qsettings->writeEntry("position", m_settings["WindowPosition"].toString());
m_qsettings->writeEntry("size", m_settings["WindowSize"].toString());
// Write last selected encoding for the opened source code file.
m_qsettings->writeEntry("encoding", m_settings["FileEncoding"].toString());
// Write maximum length of list for recently opened files.
m_qsettings->writeEntry("recentlyOpenedListSize", m_settings["RecentlyOpenedListSize"].toInt());
// Write if last opened source code file should be loaded on startup.
m_qsettings->writeEntry("loadLastSourceCodeFileOnStartup",
m_settings["LoadLastOpenedFileOnStartup"].toBool());
// Write last opened source code file from the settings file.
m_qsettings->writeEntry("lastSourceCodeFile", m_settings["LastOpenedFiles"].toString());
// Write last selected indenter from the settings file.
m_qsettings->writeEntry("selectedIndenter", m_settings["SelectedIndenter"].toInt());
// Write if syntax highlighting is enabled.
m_qsettings->writeEntry("SyntaxHighlightningEnabled",
m_settings["SyntaxHighlightningEnabled"].toBool());
// Write if white space characters should be displayed.
m_qsettings->writeEntry("whiteSpaceIsVisible", m_settings["WhiteSpaceIsVisible"].toBool());
// Write if indenter parameter tool tips are enabled.
m_qsettings->writeEntry("indenterParameterTooltipsEnabled",
m_settings["IndenterParameterTooltipsEnabled"].toBool());
// Write the tab width from the settings file.
m_qsettings->writeEntry("tabWidth", m_settings["TabWidth"].toInt());
// Write the last selected language and stores the index it has in the list of available
m_qsettings->writeEntry("language", m_availableTranslations[m_settings["Language"].toInt()]);
// TODO - MainWindow::saveState() missing in TQt3
// Write the main window state.
//m_qsettings->writeEntry("MainWindowState", m_settings["MainWindowState"].toByteArray());
}
void UiGuiSettings::emitSignalForSetting(TQString settingName)
{
}
/*
\brief Register the by \a propertyName defined property of \a obj to be connected to the setting defined by \a settingName. \brief Register the by \a propertyName defined property of \a obj to be connected to the setting defined by \a settingName.
The \a propertyName must be one of those that are listed in the TQt "Properties" documentation section of a TQt Object. The \a propertyName must be one of those that are listed in the TQt "Properties" documentation section of a TQt Object.
@ -247,7 +327,7 @@ bool UiGuiSettings::registerObjectProperty(TQObject *obj, const TQString &proper
if (connectSuccess) if (connectSuccess)
{ {
_registeredObjectProperties[obj] = TQStringList() << propertyName << settingName; m_registeredObjectProperties[obj] = TQStringList() << propertyName << settingName;
} }
else else
{ {
@ -258,14 +338,14 @@ bool UiGuiSettings::registerObjectProperty(TQObject *obj, const TQString &proper
} }
// If setting already exists, set the objects property to the setting value. // If setting already exists, set the objects property to the setting value.
if (_qsettings->contains("UniversalIndentGUI/" + settingName)) if (m_qsettings->contains("UniversalIndentGUI/" + settingName))
{ {
mProp.write(obj, _qsettings->value("UniversalIndentGUI/" + settingName)); mProp.write(obj, m_qsettings->value("UniversalIndentGUI/" + settingName));
} }
// Otherwise add the setting and set it to the value of the objects property. // Otherwise add the setting and set it to the value of the objects property.
else else
{ {
_qsettings->setValue("UniversalIndentGUI/" + settingName, mProp.read(obj)); m_qsettings->setValue("UniversalIndentGUI/" + settingName, mProp.read(obj));
} }
} }
else else
@ -278,24 +358,7 @@ bool UiGuiSettings::registerObjectProperty(TQObject *obj, const TQString &proper
return true; return true;
} }
/*! //*
\brief Searches the child TQObjects of \a obj for a property name and setting name definition within
their custom properties and registers this property name to that setting name if both were found.
The custom properties, for which are searched, are "connectedPropertyName" and "connectedSettingName",
where "connectedPropertyName" is the name of a TQObject property as it is documented in the TQtDocs, and
"connectedSettingName" is the name of a setting here within UiGuiSettings. If the mentioned setting
name doesn't exist, it will be created.
Returns true, if all found property and setting definitions could be successfully registered.
Returns false, if any of those registrations fails.
*/
bool UiGuiSettings::registerObjectPropertyRecursive(TQObject *obj)
{
return checkCustomPropertiesAndCallFunction(obj, &UiGuiSettings::registerObjectProperty);
}
/*!
\brief Assigns the by \a settingName defined setting value to the by \a propertyName defined property of \a obj. \brief Assigns the by \a settingName defined setting value to the by \a propertyName defined property of \a obj.
Returns true, if the value could be assigned, otherwise returns false, which is the case if settingName doesn't exist Returns true, if the value could be assigned, otherwise returns false, which is the case if settingName doesn't exist
@ -312,9 +375,9 @@ bool UiGuiSettings::setObjectPropertyToSettingValue(TQObject *obj, const TQStrin
TQMetaProperty mProp = metaObject->property(indexOfProp); TQMetaProperty mProp = metaObject->property(indexOfProp);
// If setting already exists, set the objects property to the setting value. // If setting already exists, set the objects property to the setting value.
if (_qsettings->contains("UniversalIndentGUI/" + settingName)) if (m_qsettings->contains("UniversalIndentGUI/" + settingName))
{ {
mProp.write(obj, _qsettings->value("UniversalIndentGUI/" + settingName)); mProp.write(obj, m_qsettings->value("UniversalIndentGUI/" + settingName));
} }
// The setting didn't exist so return that setting the objects property failed. // The setting didn't exist so return that setting the objects property failed.
else else
@ -332,7 +395,7 @@ bool UiGuiSettings::setObjectPropertyToSettingValue(TQObject *obj, const TQStrin
return true; return true;
} }
/*! /*
\brief Searches the child TQObjects of \a obj for a property name and setting name definition within \brief Searches the child TQObjects of \a obj for a property name and setting name definition within
their custom properties and sets each property to settings value. their custom properties and sets each property to settings value.
@ -348,7 +411,7 @@ bool UiGuiSettings::setObjectPropertyToSettingValueRecursive(TQObject *obj)
return checkCustomPropertiesAndCallFunction(obj, &UiGuiSettings::setObjectPropertyToSettingValue); return checkCustomPropertiesAndCallFunction(obj, &UiGuiSettings::setObjectPropertyToSettingValue);
} }
/*! /*
\brief Assigns the by \a propertyName defined property's value of \a obj to the by \a settingName defined setting. \brief Assigns the by \a propertyName defined property's value of \a obj to the by \a settingName defined setting.
If the \a settingName didn't exist yet, it will be created. If the \a settingName didn't exist yet, it will be created.
@ -377,7 +440,7 @@ bool UiGuiSettings::setSettingToObjectPropertyValue(TQObject *obj, const TQStrin
return true; return true;
} }
/*! /*
\brief Searches the child TQObjects of \a obj for a property name and setting name definition within \brief Searches the child TQObjects of \a obj for a property name and setting name definition within
their custom properties and sets each setting to the property value. their custom properties and sets each setting to the property value.
@ -394,7 +457,7 @@ bool UiGuiSettings::setSettingToObjectPropertyValueRecursive(TQObject *obj)
return checkCustomPropertiesAndCallFunction(obj, &UiGuiSettings::setSettingToObjectPropertyValue); return checkCustomPropertiesAndCallFunction(obj, &UiGuiSettings::setSettingToObjectPropertyValue);
} }
/*! /*
\brief Iterates over all \a objs child TQObjects and checks whether they have the custom properties \brief Iterates over all \a objs child TQObjects and checks whether they have the custom properties
"connectedPropertyName" and "connectedSettingName" set. If both are set, it invokes the \a callBackFunc "connectedPropertyName" and "connectedSettingName" set. If both are set, it invokes the \a callBackFunc
with both. with both.
@ -422,16 +485,16 @@ bool UiGuiSettings::checkCustomPropertiesAndCallFunction(TQObject *obj, bool (Ui
return success; return success;
} }
/*! /*
\brief The with a certain property registered \a obj gets unregistered. \brief The with a certain property registered \a obj gets unregistered.
* / * /
void UiGuiSettings::unregisterObjectProperty(TQObject *obj) void UiGuiSettings::unregisterObjectProperty(TQObject *obj)
{ {
if (_registeredObjectProperties.contains(obj)) if (m_registeredObjectProperties.contains(obj))
{ {
const TQMetaObject *metaObject = obj->metaObject(); const TQMetaObject *metaObject = obj->metaObject();
TQString propertyName = _registeredObjectProperties[obj].first(); TQString propertyName = m_registeredObjectProperties[obj].first();
TQString settingName = _registeredObjectProperties[obj].last(); TQString settingName = m_registeredObjectProperties[obj].last();
bool connectSuccess = false; bool connectSuccess = false;
int indexOfProp = metaObject->indexOfProperty(qPrintable(propertyName)); int indexOfProp = metaObject->indexOfProperty(qPrintable(propertyName));
@ -449,11 +512,11 @@ void UiGuiSettings::unregisterObjectProperty(TQObject *obj)
signal.signature())), this, SLOT(handleObjectPropertyChange())); signal.signature())), this, SLOT(handleObjectPropertyChange()));
} }
} }
_registeredObjectProperties.remove(obj); m_registeredObjectProperties.remove(obj);
} }
} }
/*! /*
\brief Registers a slot form the \a obj by its \a slotName to be invoked, if the by \a settingName defined \brief Registers a slot form the \a obj by its \a slotName to be invoked, if the by \a settingName defined
setting changes. setting changes.
@ -483,7 +546,7 @@ bool UiGuiSettings::registerObjectSlot(TQObject *obj, const TQString &slotName,
// only methods taking max one argument are allowed. // only methods taking max one argument are allowed.
if (mMethod.parameterTypes().size() <= 1) if (mMethod.parameterTypes().size() <= 1)
{ {
_registeredObjectSlots.insert(obj, TQStringList() << normalizedSlotName << settingName); m_registeredObjectSlots.insert(obj, TQStringList() << normalizedSlotName << settingName);
} }
else else
{ {
@ -502,7 +565,7 @@ bool UiGuiSettings::registerObjectSlot(TQObject *obj, const TQString &slotName,
return true; return true;
} }
/*! /*
\brief If \a obj, \a slotName and \a settingName are given, that certain connection is unregistered. \brief If \a obj, \a slotName and \a settingName are given, that certain connection is unregistered.
If only \a obj is given, all to this object registered slot-setting connections are unregistered. If only \a obj is given, all to this object registered slot-setting connections are unregistered.
* / * /
@ -511,7 +574,7 @@ void UiGuiSettings::unregisterObjectSlot(TQObject *obj, const TQString &slotName
{ {
//const TQMetaObject *metaObject = obj->metaObject(); //const TQMetaObject *metaObject = obj->metaObject();
TQString normalizedSlotName = TQMetaObject::normalizedSignature(qPrintable(slotName)); TQString normalizedSlotName = TQMetaObject::normalizedSignature(qPrintable(slotName));
TQMutableMapIterator<TQObject*, TQStringList> it(_registeredObjectSlots); TQMutableMapIterator<TQObject*, TQStringList> it(m_registeredObjectSlots);
while (it.hasNext()) while (it.hasNext())
{ {
it.next(); it.next();
@ -526,7 +589,7 @@ void UiGuiSettings::unregisterObjectSlot(TQObject *obj, const TQString &slotName
} }
} }
/*! /*
\brief This private slot gets invoked whenever a registered objects property changes \brief This private slot gets invoked whenever a registered objects property changes
and distributes the new value to all other to the same settingName registered objects. and distributes the new value to all other to the same settingName registered objects.
* / * /
@ -535,8 +598,8 @@ void UiGuiSettings::handleObjectPropertyChange()
TQObject *obj = TQObject::sender(); TQObject *obj = TQObject::sender();
TQString className = obj->metaObject()->className(); TQString className = obj->metaObject()->className();
const TQMetaObject *metaObject = obj->metaObject(); const TQMetaObject *metaObject = obj->metaObject();
TQString propertyName = _registeredObjectProperties[obj].first(); TQString propertyName = m_registeredObjectProperties[obj].first();
TQString settingName = _registeredObjectProperties[obj].last(); TQString settingName = m_registeredObjectProperties[obj].last();
int indexOfProp = metaObject->indexOfProperty(qPrintable(propertyName)); int indexOfProp = metaObject->indexOfProperty(qPrintable(propertyName));
if (indexOfProp > -1) if (indexOfProp > -1)
@ -546,7 +609,7 @@ void UiGuiSettings::handleObjectPropertyChange()
} }
} }
/*! /*
\brief Sets the setting defined by \a settingName to \a value. \brief Sets the setting defined by \a settingName to \a value.
When setting a changed value, all to this settingName registered objects get When setting a changed value, all to this settingName registered objects get
@ -556,13 +619,13 @@ void UiGuiSettings::handleObjectPropertyChange()
void UiGuiSettings::setValueByName(const TQString &settingName, const TQVariant &value) void UiGuiSettings::setValueByName(const TQString &settingName, const TQVariant &value)
{ {
// Do the updating only, if the setting was really changed. // Do the updating only, if the setting was really changed.
if (_qsettings->value("UniversalIndentGUI/" + settingName) != value) if (m_qsettings->value("UniversalIndentGUI/" + settingName) != value)
{ {
_qsettings->setValue("UniversalIndentGUI/" + settingName, value); m_qsettings->setValue("UniversalIndentGUI/" + settingName, value);
// Set the new value for all registered object properties for settingName. // Set the new value for all registered object properties for settingName.
for (TQMap<TQObject*, TQStringList>::ConstIterator it = _registeredObjectProperties.begin(); for (TQMap<TQObject*, TQStringList>::ConstIterator it = m_registeredObjectProperties.begin();
it != _registeredObjectProperties.end(); ++it) it != m_registeredObjectProperties.end(); ++it)
{ {
if (it.value().last() == settingName) if (it.value().last() == settingName)
{ {
@ -580,8 +643,8 @@ void UiGuiSettings::setValueByName(const TQString &settingName, const TQVariant
} }
// Invoke all registered object methods for settingName. // Invoke all registered object methods for settingName.
for (TQMap<TQObject*, TQStringList>::ConstIterator it = _registeredObjectSlots.begin(); for (TQMap<TQObject*, TQStringList>::ConstIterator it = m_registeredObjectSlots.begin();
it != _registeredObjectSlots.end(); ++it) it != m_registeredObjectSlots.end(); ++it)
{ {
if (it.value().last() == settingName) if (it.value().last() == settingName)
{ {
@ -925,3 +988,6 @@ bool UiGuiSettings::invokeMethodWithValue(TQObject *obj, TQMetaMethod mMethod, T
} }
} }
} }
*/
#include "UiGuiSettings.moc"

@ -0,0 +1,118 @@
/***************************************************************************
* Copyright (C) 2006-2012 by Thomas Schweitzer *
* thomas-schweitzer(at)arcor.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License version 2.0 as *
* published by the Free Software Foundation. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program in the file LICENSE.GPL; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef UIGUISETTINGS_H
#define UIGUISETTINGS_H
#include <tqmap.h>
#include <tqobject.h>
#include <tqstringlist.h>
#include <tqvariant.h>
class TQSettings;
class UiGuiSettings : public TQObject
{
Q_OBJECT
private:
UiGuiSettings();
static UiGuiSettings *m_instance;
public:
static UiGuiSettings* getInstance();
static void deleteInstance();
~UiGuiSettings();
// [--] bool registerObjectProperty(TQObject *obj, const TQString &propertyName,
// [--] const TQString &settingName);
// [--] bool setObjectPropertyToSettingValue(TQObject *obj, const TQString &propertyName,
// [--] const TQString &settingName);
// [--] bool setObjectPropertyToSettingValueRecursive(TQObject *obj);
// [--] bool setSettingToObjectPropertyValue(TQObject *obj, const TQString &propertyName,
// [--] const TQString &settingName);
// [--] bool setSettingToObjectPropertyValueRecursive(TQObject *obj);
// [--] bool registerObjectSlot(TQObject *obj, const TQString &slotName,
// [--] const TQString &settingName);
void loadSettings();
void saveSettings();
bool setValueByName(const TQString &settingName, TQVariant value);
TQVariant getValueByName(const TQString &settingName) const;
TQStringList& getAvailableTranslations();
public slots:
// [--] void unregisterObjectProperty(TQObject *obj);
// [--] void unregisterObjectSlot(TQObject *obj, const TQString &slotName = TQString::null,
// [--] const TQString &settingName = TQString::null);
// [--]
// [--] protected:
// [--]//---- bool invokeMethodWithValue(TQObject *obj, TQMetaMethod mMethod, TQVariant value);
// [--]
// [--] bool checkCustomPropertiesAndCallFunction(TQObject * obj,
// [--] bool (UiGuiSettings::*callBackFunc)(TQObject *obj, const TQString &propertyName,
// [--] const TQString &settingName));
// [--]
// [--] private slots:
// [--] void handleObjectPropertyChange();
// [++] void handleValueChangeFromExtern(int value);
// [++] void handleValueChangeFromExtern(bool value);
// [++] void handleValueChangeFromExtern(TQDate value);
// [++] void handleValueChangeFromExtern(TQByteArray value);
// Each possible setting needs an own signal.
signals:
// [++] void versionInSettingsFile(TQString value);
// [++] void windowIsMaximized(bool value);
// [++] void windowPosition(TQPoint value);
// [++] void windowSize(TQSize value);
// [++] void fileEncoding(TQString value);
// [++] void recentlyOpenedListSize(int value);
// [++] void loadLastOpenedFileOnStartup(bool value);
// [++] void lastOpenedFiles(TQString value);
// [++] void selectedIndenter(int value);
// [++] void syntaxHighlightningEnabled(bool value);
// [++] void whiteSpaceIsVisible(bool value);
// [++] void indenterParameterTooltipsEnabled(bool value);
// [++] void tabWidth(int value);
// [++] void language(int value);
// [++] void lastUpdateCheck(TQDate value);
// [++] void mainWindowState(TQByteArray value);
private:
void emitSignalForSetting(TQString settingName);
void readAvailableTranslations();
// Stores the mnemonics of the available translations.
TQStringList m_availableTranslations;
// The settings file.
TQSettings *m_qsettings;
// This map holds all possible settings defined by their name as TQString.
TQMap<TQString, TQVariant> m_settings;
// The path where the indenters are located
TQString m_indenterDirectoryStr;
};
#endif // UIGUISETTINGS_H

@ -27,7 +27,7 @@
#include <tqtimeline.h> #include <tqtimeline.h>
#include <tntqsplashscreen.h> #include <tntqsplashscreen.h>
/*! /*
\class AboutDialogGraphicsView \class AboutDialogGraphicsView
\brief A container for the real \a AboutDialog. Makes the 3D animation possible. \brief A container for the real \a AboutDialog. Makes the 3D animation possible.
@ -36,7 +36,7 @@
when shown starts in frameless fullscreen mode with a screenshot of the desktop as background. when shown starts in frameless fullscreen mode with a screenshot of the desktop as background.
*/ */
/*! /*
\brief The constructor initializes everything needed for the 3D animation. \brief The constructor initializes everything needed for the 3D animation.
*/ */
AboutDialogGraphicsView::AboutDialogGraphicsView(AboutDialog *aboutDialog, TQWidget *parentWindow) : AboutDialogGraphicsView::AboutDialogGraphicsView(AboutDialog *aboutDialog, TQWidget *parentWindow) :
@ -93,7 +93,7 @@ AboutDialogGraphicsView::~AboutDialogGraphicsView(void)
{ {
} }
/*! /*
\brief Grabs a screenshot of the full desktop and shows that as background. Above that background the \brief Grabs a screenshot of the full desktop and shows that as background. Above that background the
AboutDialog 3D animation is shown. Also grabs the content of the AboutDialog itself. AboutDialog 3D animation is shown. Also grabs the content of the AboutDialog itself.
*/ */
@ -155,7 +155,7 @@ void AboutDialogGraphicsView::show()
_timeLine->start(); _timeLine->start();
} }
/*! /*
\brief Does the next calculation/transformation step. \brief Does the next calculation/transformation step.
*/ */
void AboutDialogGraphicsView::updateStep(int step) void AboutDialogGraphicsView::updateStep(int step)
@ -170,7 +170,7 @@ void AboutDialogGraphicsView::updateStep(int step)
//update(); //update();
} }
/*! /*
\brief Stops the 3D animation, moves the AboutDialog to the correct place and really shows it. \brief Stops the 3D animation, moves the AboutDialog to the correct place and really shows it.
*/ */
void AboutDialogGraphicsView::showAboutDialog() void AboutDialogGraphicsView::showAboutDialog()
@ -183,7 +183,7 @@ void AboutDialogGraphicsView::showAboutDialog()
_aboutDialog->exec(); _aboutDialog->exec();
} }
/*! /*
\brief Does not directly hide the AboutDialog but instead starts the "fade out" 3D animation. \brief Does not directly hide the AboutDialog but instead starts the "fade out" 3D animation.
*/ */
void AboutDialogGraphicsView::hide() void AboutDialogGraphicsView::hide()
@ -209,7 +209,7 @@ void AboutDialogGraphicsView::hide()
_timeLine->start(); _timeLine->start();
} }
/*! /*
\brief This slot really hides this AboutDialog container. \brief This slot really hides this AboutDialog container.
*/ */
void AboutDialogGraphicsView::hideReally() void AboutDialogGraphicsView::hideReally()

@ -62,9 +62,9 @@ inline void UNUSED_PARAMETER_WARNING_AVOID(T)
{ {
} }
//! \defgroup grp_Indenter All concerning handling of the indenter. // \defgroup grp_Indenter All concerning handling of the indenter.
/*! /*
\class IndentHandler \class IndentHandler
\ingroup grp_Indenter \ingroup grp_Indenter
\brief A widget for handling many indenters that are configured by an ini file. \brief A widget for handling many indenters that are configured by an ini file.
@ -76,7 +76,7 @@ inline void UNUSED_PARAMETER_WARNING_AVOID(T)
*/ */
/*! /*
\brief Constructor of the indent handler. \brief Constructor of the indent handler.
By calling this constructor the indenter to be loaded, can be selected by setting By calling this constructor the indenter to be loaded, can be selected by setting
@ -211,7 +211,7 @@ IndentHandler::IndentHandler(int indenterID, TQWidget *mainWindow, TQWidget *par
retranslateUi(); retranslateUi();
} }
/*! /*
\brief Implicitly writes the current indenter parameters to the indenters config file. \brief Implicitly writes the current indenter parameters to the indenters config file.
*/ */
IndentHandler::~IndentHandler() IndentHandler::~IndentHandler()
@ -226,7 +226,7 @@ IndentHandler::~IndentHandler()
delete _errorMessageDialog; delete _errorMessageDialog;
} }
/*! /*
\brief Initializes the context menu used for some actions like saving the indenter config file. \brief Initializes the context menu used for some actions like saving the indenter config file.
*/ */
void IndentHandler::initIndenterMenu() void IndentHandler::initIndenterMenu()
@ -262,7 +262,7 @@ void IndentHandler::initIndenterMenu()
} }
} }
/*! /*
\brief Returns the context menu used for some actions like saving the indenter config file. \brief Returns the context menu used for some actions like saving the indenter config file.
*/ */
TQMenu* IndentHandler::getIndenterMenu() TQMenu* IndentHandler::getIndenterMenu()
@ -270,7 +270,7 @@ TQMenu* IndentHandler::getIndenterMenu()
return _menuIndenter; return _menuIndenter;
} }
/*! /*
\brief Returns the actions of the context menu used for some actions like saving the indenter config file. \brief Returns the actions of the context menu used for some actions like saving the indenter config file.
*/ */
TQList<TQAction*> IndentHandler::getIndenterMenuActions() TQList<TQAction*> IndentHandler::getIndenterMenuActions()
@ -281,7 +281,7 @@ TQList<TQAction*> IndentHandler::getIndenterMenuActions()
return actionList; return actionList;
} }
/*! /*
\brief Opens the context menu, used for some actions like saving the indenter config file, at the event position. \brief Opens the context menu, used for some actions like saving the indenter config file, at the event position.
*/ */
void IndentHandler::contextMenuEvent(TQContextMenuEvent *event) void IndentHandler::contextMenuEvent(TQContextMenuEvent *event)
@ -289,7 +289,7 @@ void IndentHandler::contextMenuEvent(TQContextMenuEvent *event)
getIndenterMenu()->exec(event->globalPos()); getIndenterMenu()->exec(event->globalPos());
} }
/*! /*
\brief Creates the content for a shell script that can be used as a external tool call \brief Creates the content for a shell script that can be used as a external tool call
to indent an as parameter defined file. to indent an as parameter defined file.
*/ */
@ -400,7 +400,7 @@ TQString IndentHandler::generateShellScript(const TQString &configFilename)
return shellScript; return shellScript;
} }
/*! /*
\brief Format \a sourceCode by calling the indenter. \brief Format \a sourceCode by calling 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
@ -418,7 +418,7 @@ TQString IndentHandler::callIndenter(TQString sourceCode, TQString inputFileExte
} }
} }
/*! /*
\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
@ -442,7 +442,7 @@ TQString IndentHandler::callJavaScriptIndenter(TQString sourceCode)
return value.toString(); return value.toString();
} }
/*! /*
\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
@ -755,7 +755,7 @@ TQString IndentHandler::callExecutableIndenter(TQString sourceCode, TQString inp
return formattedSourceCode; return formattedSourceCode;
} }
/*! /*
\brief Generates and returns a string with all parameters needed to call the indenter. \brief Generates and returns a string with all parameters needed to call the indenter.
*/ */
TQString IndentHandler::getParameterString() TQString IndentHandler::getParameterString()
@ -817,7 +817,7 @@ TQString IndentHandler::getParameterString()
return parameterString; return parameterString;
} }
/*! /*
\brief Write settings for the indenter to a config file. \brief Write settings for the indenter to a config file.
*/ */
void IndentHandler::saveConfigFile(TQString filePathName, TQString paramString) void IndentHandler::saveConfigFile(TQString filePathName, TQString paramString)
@ -830,7 +830,7 @@ void IndentHandler::saveConfigFile(TQString filePathName, TQString paramString)
cfgFile.close(); cfgFile.close();
} }
/*! /*
\brief Load the config file for the indenter and apply the settings made there. \brief Load the config file for the indenter and apply the settings made there.
*/ */
bool IndentHandler::loadConfigFile(TQString filePathName) bool IndentHandler::loadConfigFile(TQString filePathName)
@ -1034,7 +1034,7 @@ bool IndentHandler::loadConfigFile(TQString filePathName)
return true; return true;
} }
/*! /*
\brief Sets all indenter parameters to their default values defined in the ini file. \brief Sets all indenter parameters to their default values defined in the ini file.
*/ */
void IndentHandler::resetToDefaultValues() void IndentHandler::resetToDefaultValues()
@ -1076,7 +1076,7 @@ void IndentHandler::resetToDefaultValues()
} }
} }
/*! /*
\brief Opens and parses the indenter ini file that is declared by \a iniFilePath. \brief Opens and parses the indenter ini file that is declared by \a iniFilePath.
*/ */
void IndentHandler::readIndentIniFile(TQString iniFilePath) void IndentHandler::readIndentIniFile(TQString iniFilePath)
@ -1417,7 +1417,7 @@ void IndentHandler::readIndentIniFile(TQString iniFilePath)
} }
} }
/*! /*
\brief Searches and returns all indenters a configuration file is found for. \brief Searches and returns all indenters a configuration file is found for.
Opens all uigui ini files found in the list \a _indenterIniFileList, opens each ini file Opens all uigui ini files found in the list \a _indenterIniFileList, opens each ini file
@ -1453,7 +1453,7 @@ TQStringList IndentHandler::getAvailableIndenters()
return indenterNamesList; return indenterNamesList;
} }
/*! /*
\brief Deletes all elements in the toolbox and initializes the indenter selected by \a indenterID. \brief Deletes all elements in the toolbox and initializes the indenter selected by \a indenterID.
*/ */
void IndentHandler::setIndenter(int indenterID) void IndentHandler::setIndenter(int indenterID)
@ -1528,7 +1528,7 @@ void IndentHandler::setIndenter(int indenterID)
#endif // UNIVERSALINDENTGUI_NPP_EXPORTS #endif // UNIVERSALINDENTGUI_NPP_EXPORTS
} }
/*! /*
\brief Returns a string containing by the indenter supported file types/extensions divided by a space. \brief Returns a string containing by the indenter supported file types/extensions divided by a space.
*/ */
TQString IndentHandler::getPossibleIndenterFileExtensions() TQString IndentHandler::getPossibleIndenterFileExtensions()
@ -1536,7 +1536,7 @@ TQString IndentHandler::getPossibleIndenterFileExtensions()
return _fileTypes; return _fileTypes;
} }
/*! /*
\brief Returns the path and filename of the current indenter config file. \brief Returns the path and filename of the current indenter config file.
*/ */
TQString IndentHandler::getIndenterCfgFile() TQString IndentHandler::getIndenterCfgFile()
@ -1545,7 +1545,7 @@ TQString IndentHandler::getIndenterCfgFile()
return fileInfo.absoluteFilePath(); return fileInfo.absoluteFilePath();
} }
/*! /*
\brief Tries to create a call path string for the indenter executable. If successful returns true. \brief Tries to create a call path string for the indenter executable. If successful returns true.
*/ */
bool IndentHandler::createIndenterCallString() bool IndentHandler::createIndenterCallString()
@ -1709,7 +1709,7 @@ bool IndentHandler::createIndenterCallString()
return false; return false;
} }
/*! /*
\brief Returns a string that points to where the indenters manual can be found. \brief Returns a string that points to where the indenters manual can be found.
*/ */
TQString IndentHandler::getManual() TQString IndentHandler::getManual()
@ -1724,7 +1724,7 @@ TQString IndentHandler::getManual()
} }
} }
/*! /*
\brief This slot gets the reference to the indenters manual and opens it. \brief This slot gets the reference to the indenters manual and opens it.
*/ */
void IndentHandler::showIndenterManual() void IndentHandler::showIndenterManual()
@ -1733,7 +1733,7 @@ void IndentHandler::showIndenterManual()
TQDesktopServices::openUrl(manualReference); TQDesktopServices::openUrl(manualReference);
} }
/*! /*
\brief Can be called to update all widgets text to the currently selected language. \brief Can be called to update all widgets text to the currently selected language.
*/ */
void IndentHandler::retranslateUi() void IndentHandler::retranslateUi()
@ -1776,7 +1776,7 @@ void IndentHandler::retranslateUi()
"Resets all indenter parameters to the default values.", 0, TQApplication::UnicodeUTF8)); "Resets all indenter parameters to the default values.", 0, TQApplication::UnicodeUTF8));
} }
/*! /*
\brief Returns the name of the currently selected indenter. \brief Returns the name of the currently selected indenter.
*/ */
TQString IndentHandler::getCurrentIndenterName() TQString IndentHandler::getCurrentIndenterName()
@ -1793,7 +1793,7 @@ TQString IndentHandler::getCurrentIndenterName()
return currentIndenterName; return currentIndenterName;
} }
/*! /*
\brief Shows a file open dialog to open an existing config file for the currently selected indenter. \brief Shows a file open dialog to open an existing config file for the currently selected indenter.
If the file was successfully opened the indent handler is called to load the settings and update itself. If the file was successfully opened the indent handler is called to load the settings and update itself.
@ -1815,7 +1815,7 @@ void IndentHandler::openConfigFileDialog()
} }
} }
/*! /*
\brief Calls the indenter config file save as dialog to save the config file under a chosen name. \brief Calls the indenter config file save as dialog to save the config file under a chosen name.
If the file already exists and it should be overwritten, a warning is shown before. If the file already exists and it should be overwritten, a warning is shown before.
@ -1839,7 +1839,7 @@ void IndentHandler::saveasIndentCfgFileDialog()
} }
} }
/*! /*
\brief Invokes the indenter to create a shell script. \brief Invokes the indenter to create a shell script.
Lets the indenter create a shell script for calling the indenter out of any Lets the indenter create a shell script for calling the indenter out of any
@ -1904,7 +1904,7 @@ void IndentHandler::createIndenterCallShellScript()
} }
} }
/*! /*
\brief Resets all parameters to the indenters default values as they are specified in the uigui ini file \brief Resets all parameters to the indenters default values as they are specified in the uigui ini file
but asks the user whether to do it really. but asks the user whether to do it really.
*/ */
@ -1919,7 +1919,7 @@ void IndentHandler::resetIndenterParameter()
} }
} }
/*! /*
\brief Catch some events and let some other be handled by the super class. \brief Catch some events and let some other be handled by the super class.
Is needed for use as Notepad++ plugin. Is needed for use as Notepad++ plugin.
@ -1943,7 +1943,7 @@ bool IndentHandler::event(TQEvent *event)
} }
} }
/*! /*
\brief Sets the function pointer \a _parameterChangedCallback to the given callback \brief Sets the function pointer \a _parameterChangedCallback to the given callback
function \a paramChangedCallback. function \a paramChangedCallback.
@ -1954,7 +1954,7 @@ void IndentHandler::setParameterChangedCallback(void (*paramChangedCallback)(voi
_parameterChangedCallback = paramChangedCallback; _parameterChangedCallback = paramChangedCallback;
} }
/*! /*
\brief Emits the \a indenterSettingsChanged signal and if set executes the \a _parameterChangedCallback function. \brief Emits the \a indenterSettingsChanged signal and if set executes the \a _parameterChangedCallback function.
Is needed for use as Notepad++ plugin. Is needed for use as Notepad++ plugin.
@ -1969,7 +1969,7 @@ void IndentHandler::handleChangedIndenterSettings()
} }
} }
/*! /*
\brief Sets a callback function that shall be called, when the this indenter parameter window gets closed. \brief Sets a callback function that shall be called, when the this indenter parameter window gets closed.
Is needed for use as Notepad++ plugin. Is needed for use as Notepad++ plugin.
@ -1979,7 +1979,7 @@ void IndentHandler::setWindowClosedCallback(void (*winClosedCallback)(void))
_windowClosedCallback = winClosedCallback; _windowClosedCallback = winClosedCallback;
} }
/*! /*
\brief Is called on this indenter parameter window close and if set calls the function \a _windowClosedCallback. \brief Is called on this indenter parameter window close and if set calls the function \a _windowClosedCallback.
Is needed for use as Notepad++ plugin. Is needed for use as Notepad++ plugin.
@ -1993,7 +1993,7 @@ void IndentHandler::closeEvent(TQCloseEvent *event)
event->accept(); event->accept();
} }
/*! /*
\brief Returns the id (list index) of the currently selected indenter. \brief Returns the id (list index) of the currently selected indenter.
*/ */
int IndentHandler::getIndenterId() int IndentHandler::getIndenterId()
@ -2023,7 +2023,7 @@ void IndentHandler::wheelEvent(TQWheelEvent *event)
#endif // UNIVERSALINDENTGUI_NPP_EXPORTS #endif // UNIVERSALINDENTGUI_NPP_EXPORTS
} }
/*! /*
\brief Converts characters < > and & in the \a text to HTML codes &lt &gt and &amp. \brief Converts characters < > and & in the \a text to HTML codes &lt &gt and &amp.
*/ */

@ -89,7 +89,7 @@ class IndentHandler : public TQWidget
bool createIndenterCallString(); bool createIndenterCallString();
void initIndenterMenu(); void initIndenterMenu();
//! Holds a reference to all created pages of the parameter categories toolbox and the pages // Holds a reference to all created pages of the parameter categories toolbox and the pages
// boxlayout // boxlayout
struct IndenterParameterCategoryPage struct IndenterParameterCategoryPage
{ {
@ -99,7 +99,7 @@ class IndentHandler : public TQWidget
TQVector<IndenterParameterCategoryPage> _indenterParameterCategoryPages; TQVector<IndenterParameterCategoryPage> _indenterParameterCategoryPages;
//! Holds a reference to all checkboxes needed for boolean parameter setting and the parameters // Holds a reference to all checkboxes needed for boolean parameter setting and the parameters
// name // name
struct ParamBoolean struct ParamBoolean
{ {
@ -111,7 +111,7 @@ class IndentHandler : public TQWidget
TQVector<ParamBoolean> _paramBooleans; TQVector<ParamBoolean> _paramBooleans;
//! Holds a reference to all line edits needed for parameter setting and the parameters name // Holds a reference to all line edits needed for parameter setting and the parameters name
struct ParamString struct ParamString
{ {
TQString paramName; TQString paramName;
@ -123,7 +123,7 @@ class IndentHandler : public TQWidget
TQVector<ParamString> _paramStrings; TQVector<ParamString> _paramStrings;
//! Hold a reference to all spin boxes needed for parameter setting and the parameters name // Hold a reference to all spin boxes needed for parameter setting and the parameters name
struct ParamNumeric struct ParamNumeric
{ {
TQString paramName; TQString paramName;
@ -135,7 +135,7 @@ class IndentHandler : public TQWidget
TQVector<ParamNumeric> _paramNumerics; TQVector<ParamNumeric> _paramNumerics;
//! Hold a reference to all combo boxes needed for parameter setting and the parameters name // Hold a reference to all combo boxes needed for parameter setting and the parameters name
struct ParamMultiple struct ParamMultiple
{ {
TQString paramName; TQString paramName;
@ -150,14 +150,14 @@ class IndentHandler : public TQWidget
TQComboBox *_indenterSelectionCombobox; TQComboBox *_indenterSelectionCombobox;
TQToolButton *_indenterParameterHelpButton; TQToolButton *_indenterParameterHelpButton;
//! Vertical layout box, into which the toolbox will be added // Vertical layout box, into which the toolbox will be added
TQVBoxLayout *_toolBoxContainerLayout; TQVBoxLayout *_toolBoxContainerLayout;
TQToolBox *_indenterParameterCategoriesToolBox; TQToolBox *_indenterParameterCategoriesToolBox;
UiGuiIniFileParser *_indenterSettings; UiGuiIniFileParser *_indenterSettings;
TQStringList _indenterParameters; TQStringList _indenterParameters;
//! The indenters name in a descriptive form // The indenters name in a descriptive form
TQString _indenterName; TQString _indenterName;
//! The indenters file name (w/o extension), that is being called // The indenters file name (w/o extension), that is being called
TQString _indenterFileName; TQString _indenterFileName;
TQString _indenterDirctoryStr; TQString _indenterDirctoryStr;
TQString _tempDirctoryStr; TQString _tempDirctoryStr;
@ -183,9 +183,9 @@ class IndentHandler : public TQWidget
TQAction *_actionSaveIndenterConfigFile; TQAction *_actionSaveIndenterConfigFile;
TQAction *_actionCreateShellScript; TQAction *_actionCreateShellScript;
TQAction *_actionResetIndenterParameters; TQAction *_actionResetIndenterParameters;
//! Needed for the NPP plugin. // Needed for the NPP plugin.
void (*_parameterChangedCallback)(void); void (*_parameterChangedCallback)(void);
//! Needed for the NPP plugin. // Needed for the NPP plugin.
void (*_windowClosedCallback)(void); void (*_windowClosedCallback)(void);
//TODO: This function should go into a string helper/tool class/file. //TODO: This function should go into a string helper/tool class/file.

@ -22,7 +22,7 @@
// Need to include TQObject here so that platform specific defines like Q_OS_WIN32 are set. // Need to include TQObject here so that platform specific defines like Q_OS_WIN32 are set.
#include <tntqobject.h> #include <tntqobject.h>
/*! /*
\brief The only and static function of this class returns a batch or shell script \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 command line.

@ -21,7 +21,7 @@
#include <tntqcheckbox.h> #include <tntqcheckbox.h>
/*! /*
\class UiGuiErrorMessage \class UiGuiErrorMessage
\ingroup grp_Dialogs \ingroup grp_Dialogs
\brief UiGuiErrorMessage is a child of TQErrorMessage. But TQErrorMessages \brief UiGuiErrorMessage is a child of TQErrorMessage. But TQErrorMessages
@ -30,7 +30,7 @@
*/ */
/*! /*
\brief Initializes the dialog. \brief Initializes the dialog.
Retrieves the object pointer to the \a _showAgainCheckBox check box, sets the dialogs Retrieves the object pointer to the \a _showAgainCheckBox check box, sets the dialogs
@ -44,14 +44,14 @@ UiGuiErrorMessage::UiGuiErrorMessage(TQWidget *parent) :
_showAgainCheckBox->setText(tr("Show this message again")); _showAgainCheckBox->setText(tr("Show this message again"));
} }
/*! /*
\brief Just a lazy nothin doin destructive destructor. \brief Just a lazy nothin doin destructive destructor.
*/ */
UiGuiErrorMessage::~UiGuiErrorMessage(void) UiGuiErrorMessage::~UiGuiErrorMessage(void)
{ {
} }
/*! /*
\brief Shows an error \a message in a dialog box with \a title. \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 The shown \a message is added to a list, if not already in there. If it is
@ -84,7 +84,7 @@ void UiGuiErrorMessage::showMessage(const TQString &title, const TQString &messa
} }
} }
/*! /*
\brief For convinience, for showing a dialog box with the default title "UniversalIndentGUI". \brief For convinience, for showing a dialog box with the default title "UniversalIndentGUI".
*/ */
void UiGuiErrorMessage::showMessage(const TQString &message) void UiGuiErrorMessage::showMessage(const TQString &message)

@ -74,15 +74,15 @@
#include <Qsci/qscilexeryaml.h> #include <Qsci/qscilexeryaml.h>
#endif #endif
//! \defgroup grp_EditorComponent All concerning editor widget. // \defgroup grp_EditorComponent All concerning editor widget.
/*! /*
\class UiGuiHighlighter \class UiGuiHighlighter
\ingroup grp_EditorComponent \ingroup grp_EditorComponent
\brief UiGuiHighlighter used for selecting the syntax highlighter/lexer for the QsciScintilla component. \brief UiGuiHighlighter used for selecting the syntax highlighter/lexer for the QsciScintilla component.
*/ */
/*! /*
\brief The constructor initializes some regular expressions and keywords to identify cpp tokens \brief The constructor initializes some regular expressions and keywords to identify cpp tokens
*/ */
UiGuiHighlighter::UiGuiHighlighter(QsciScintilla *parent) : UiGuiHighlighter::UiGuiHighlighter(QsciScintilla *parent) :
@ -159,7 +159,7 @@ UiGuiHighlighter::UiGuiHighlighter(QsciScintilla *parent) :
setLexerForExtension("cpp"); setLexerForExtension("cpp");
} }
/*! /*
\brief Returns the available highlighters as TQStringList. \brief Returns the available highlighters as TQStringList.
*/ */
TQStringList UiGuiHighlighter::getAvailableHighlighters() TQStringList UiGuiHighlighter::getAvailableHighlighters()
@ -167,7 +167,7 @@ TQStringList UiGuiHighlighter::getAvailableHighlighters()
return _mapHighlighternameToExtension.keys(); return _mapHighlighternameToExtension.keys();
} }
/*! /*
\brief This slot handles signals coming from selecting another syntax highlighter. \brief This slot handles signals coming from selecting another syntax highlighter.
*/ */
void UiGuiHighlighter::setHighlighterByAction(TQAction *highlighterAction) void UiGuiHighlighter::setHighlighterByAction(TQAction *highlighterAction)
@ -182,7 +182,7 @@ void UiGuiHighlighter::setHighlighterByAction(TQAction *highlighterAction)
_qsciEditorParent->verticalScrollBar()->setValue(scrollPos); _qsciEditorParent->verticalScrollBar()->setValue(scrollPos);
} }
/*! /*
\brief Turns the syntax parser on. \brief Turns the syntax parser on.
*/ */
void UiGuiHighlighter::turnHighlightOn() void UiGuiHighlighter::turnHighlightOn()
@ -192,23 +192,18 @@ void UiGuiHighlighter::turnHighlightOn()
readCurrentSettings(""); readCurrentSettings("");
} }
/*! /*
\brief Turns the syntax parser off. \brief Turns the syntax parser off.
*/ */
void UiGuiHighlighter::turnHighlightOff() void UiGuiHighlighter::turnHighlightOff()
{ {
_highlightningIsOn = false; _highlightningIsOn = false;
_qsciEditorParent->setLexer(); _qsciEditorParent->setLexer();
#if defined (Q_OS_WIN) || defined (Q_OS_MAC)
_qsciEditorParent->setFont(TQFont("Courier", 10, TQFont::Normal));
_qsciEditorParent->setMarginsFont(TQFont("Courier", 10, TQFont::Normal));
#else
_qsciEditorParent->setFont(TQFont("Monospace", 10, TQFont::Normal)); _qsciEditorParent->setFont(TQFont("Monospace", 10, TQFont::Normal));
_qsciEditorParent->setMarginsFont(TQFont("Monospace", 10, TQFont::Normal)); _qsciEditorParent->setMarginsFont(TQFont("Monospace", 10, TQFont::Normal));
#endif
} }
/*! /*
\brief Read the settings for the current lexer from the settings file. \brief Read the settings for the current lexer from the settings file.
*/ */
@ -271,9 +266,6 @@ bool UiGuiHighlighter::readCurrentSettings(const char *prefix)
{ {
TQFont f; TQFont f;
#if defined (Q_OS_WIN) || defined (Q_OS_MAC)
f.setFamily(fdesc[0]);
#else
if (fdesc[0].contains("courier", TQt::CaseInsensitive)) if (fdesc[0].contains("courier", TQt::CaseInsensitive))
{ {
f.setFamily("Monospace"); f.setFamily("Monospace");
@ -282,7 +274,6 @@ bool UiGuiHighlighter::readCurrentSettings(const char *prefix)
{ {
f.setFamily(fdesc[0]); f.setFamily(fdesc[0]);
} }
#endif
f.setPointSize(fdesc[1].toInt()); f.setPointSize(fdesc[1].toInt());
f.setBold(fdesc[2].toInt()); f.setBold(fdesc[2].toInt());
f.setItalic(fdesc[3].toInt()); f.setItalic(fdesc[3].toInt());
@ -317,7 +308,7 @@ bool UiGuiHighlighter::readCurrentSettings(const char *prefix)
return rc; return rc;
} }
/*! /*
\brief Write the settings for the current lexer to the settings file. \brief Write the settings for the current lexer to the settings file.
*/ */
void UiGuiHighlighter::writeCurrentSettings(const char *prefix) void UiGuiHighlighter::writeCurrentSettings(const char *prefix)
@ -390,7 +381,7 @@ void UiGuiHighlighter::writeCurrentSettings(const char *prefix)
} }
} }
/*! /*
\brief Sets the \a color for the given \a style. \brief Sets the \a color for the given \a style.
*/ */
void UiGuiHighlighter::setColor(const TQColor &color, int style) void UiGuiHighlighter::setColor(const TQColor &color, int style)
@ -399,7 +390,7 @@ void UiGuiHighlighter::setColor(const TQColor &color, int style)
_lexer->setColor(color, style); _lexer->setColor(color, style);
} }
/*! /*
\brief Sets the \a font for the given \a style. \brief Sets the \a font for the given \a style.
*/ */
void UiGuiHighlighter::setFont(const TQFont &font, int style) void UiGuiHighlighter::setFont(const TQFont &font, int style)
@ -408,7 +399,7 @@ void UiGuiHighlighter::setFont(const TQFont &font, int style)
_lexer->setFont(font, style); _lexer->setFont(font, style);
} }
/*! /*
\brief Sets the to be used lexer by giving his name. \brief Sets the to be used lexer by giving his name.
*/ */
void UiGuiHighlighter::setLexerByName(TQString lexerName) void UiGuiHighlighter::setLexerByName(TQString lexerName)
@ -416,7 +407,7 @@ void UiGuiHighlighter::setLexerByName(TQString lexerName)
setLexerForExtension(_mapHighlighternameToExtension[lexerName].first()); setLexerForExtension(_mapHighlighternameToExtension[lexerName].first());
} }
/*! /*
\brief Sets the proper highlighter / lexer for the given file \a extension. Returns the index of the used lexer in the list. \brief Sets the proper highlighter / lexer for the given file \a extension. Returns the index of the used lexer in the list.
*/ */
int UiGuiHighlighter::setLexerForExtension(TQString extension) int UiGuiHighlighter::setLexerForExtension(TQString extension)

@ -47,15 +47,15 @@ class UiGuiHighlighter : public TQObject
TQStringList getAvailableHighlighters(); TQStringList getAvailableHighlighters();
public slots: public slots:
//! The foreground color for style number \a style is set to \a color. If // The foreground color for style number \a style is set to \a color. If
//! \a style is -1 then the color is set for all styles. // \a style is -1 then the color is set for all styles.
void setColor(const TQColor &color, int style = -1); void setColor(const TQColor &color, int style = -1);
//! The font for style number \a style is set to \a font. If \a style is // The font for style number \a style is set to \a font. If \a style is
//! -1 then the font is set for all styles. // -1 then the font is set for all styles.
void setFont(const TQFont &font, int style = -1); void setFont(const TQFont &font, int style = -1);
//! Sets the lexer that is responsible for the given \a extension. // Sets the lexer that is responsible for the given \a extension.
int setLexerForExtension(TQString extension); int setLexerForExtension(TQString extension);
void setLexerByName(TQString lexerName); void setLexerByName(TQString lexerName);

@ -24,9 +24,9 @@
#include <tntqmessagebox.h> #include <tntqmessagebox.h>
#include <tqtdebug.h> #include <tqtdebug.h>
//! \defgroup grp_Server All concerning the server component. // \defgroup grp_Server All concerning the server component.
/*! /*
\class UiGuiIndentServer \class UiGuiIndentServer
\ingroup grp_Server \ingroup grp_Server
\brief UiGuiIndentServer is in such an early state, that even the communication \brief UiGuiIndentServer is in such an early state, that even the communication

@ -24,9 +24,9 @@
#include <tntqvariant.h> #include <tntqvariant.h>
#include <tntqtextstream.h> #include <tntqtextstream.h>
//! \defgroup grp_Settings All concerning applications settings. // \defgroup grp_Settings All concerning applications settings.
/*! /*
\class UiGuiIniFileParser \class UiGuiIniFileParser
\ingroup grp_Settings \ingroup grp_Settings
\brief UiGuiIniFileParser is a simple ini file format parser. \brief UiGuiIniFileParser is a simple ini file format parser.
@ -40,7 +40,7 @@
rewrites a settings file sorted. Very annoying for me. rewrites a settings file sorted. Very annoying for me.
*/ */
/*! /*
\brief Init and empty all needed lists and strings. \brief Init and empty all needed lists and strings.
*/ */
UiGuiIniFileParser::UiGuiIniFileParser(void) UiGuiIniFileParser::UiGuiIniFileParser(void)
@ -48,7 +48,7 @@ UiGuiIniFileParser::UiGuiIniFileParser(void)
init(); init();
} }
/*! /*
\brief Directly loads and parses the file with name \a iniFileName. \brief Directly loads and parses the file with name \a iniFileName.
*/ */
UiGuiIniFileParser::UiGuiIniFileParser(const TQString &iniFileName) UiGuiIniFileParser::UiGuiIniFileParser(const TQString &iniFileName)
@ -69,7 +69,7 @@ UiGuiIniFileParser::~UiGuiIniFileParser(void)
{ {
} }
/*! /*
\brief Returns the group/section names in the same order as they occurr in the ini file as TQStringList. \brief Returns the group/section names in the same order as they occurr in the ini file as TQStringList.
*/ */
TQStringList UiGuiIniFileParser::childGroups() TQStringList UiGuiIniFileParser::childGroups()
@ -84,7 +84,7 @@ TQStringList UiGuiIniFileParser::childGroups()
return sectionsStringList; return sectionsStringList;
} }
/*! /*
\brief Returns the value of the defined \a keyName as TQVariant. \brief Returns the value of the defined \a keyName as TQVariant.
The \a keyName is assembled by a section name, a slash and the key name itself. The \a keyName is assembled by a section name, a slash and the key name itself.
@ -97,7 +97,7 @@ TQVariant UiGuiIniFileParser::value(const TQString &keyName, const TQString &def
return _keyValueMap.value(keyName, defaultValue); return _keyValueMap.value(keyName, defaultValue);
} }
/*! /*
\brief Parses the ini file and stores the key value pairs in the internal vectors \a keys and \a values. \brief Parses the ini file and stores the key value pairs in the internal vectors \a keys and \a values.
*/ */
void UiGuiIniFileParser::parseIniFile() void UiGuiIniFileParser::parseIniFile()

@ -1,94 +0,0 @@
/***************************************************************************
* Copyright (C) 2006-2012 by Thomas Schweitzer *
* thomas-schweitzer(at)arcor.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License version 2.0 as *
* published by the Free Software Foundation. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program in the file LICENSE.GPL; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef UIGUISETTINGS_H
#define UIGUISETTINGS_H
#include <tqobject.h>
#include <tqstringlist.h>
/////#include <tqmultimap.h>
class TQSettings;
class UiGuiSettings : public TQObject
{
Q_OBJECT
private:
UiGuiSettings();
static UiGuiSettings *_instance;
public:
static UiGuiSettings* getInstance();
~UiGuiSettings();
bool registerObjectProperty(TQObject *obj, const TQString &propertyName,
const TQString &settingName);
bool registerObjectPropertyRecursive(TQObject *obj);
bool setObjectPropertyToSettingValue(TQObject *obj, const TQString &propertyName,
const TQString &settingName);
bool setObjectPropertyToSettingValueRecursive(TQObject *obj);
bool setSettingToObjectPropertyValue(TQObject *obj, const TQString &propertyName,
const TQString &settingName);
bool setSettingToObjectPropertyValueRecursive(TQObject *obj);
bool registerObjectSlot(TQObject *obj, const TQString &slotName,
const TQString &settingName);
TQVariant getValueByName(TQString settingName);
TQStringList getAvailableTranslations();
public slots:
void setValueByName(const TQString &settingName, const TQVariant &value);
void unregisterObjectProperty(TQObject *obj);
void unregisterObjectSlot(TQObject *obj, const TQString &slotName = "",
const TQString &settingName = "");
protected:
bool initSettings();
bool invokeMethodWithValue(TQObject *obj, TQMetaMethod mMethod, TQVariant value);
bool checkCustomPropertiesAndCallFunction(TQObject * obj,
bool (UiGuiSettings::*callBackFunc)(TQObject *obj, const TQString &propertyName,
const TQString &settingName));
private slots:
void handleObjectPropertyChange();
private:
void readAvailableTranslations();
//! Stores the mnemonics of the available translations.
TQStringList _availableTranslations;
//! The settings file.
TQSettings *_qsettings;
//! Maps an TQObject to a string list containing the property name and the associated setting
// name.
TQMap<TQObject*, TQStringList> _registeredObjectProperties;
//! Maps TQObjects to a string list containing the method name and the associated setting name.
TQMultiMap<TQObject*, TQStringList> _registeredObjectSlots;
TQString _indenterDirctoryStr;
};
#endif // UIGUISETTINGS_H

@ -22,13 +22,13 @@
#include "UiGuiSettings.h" #include "UiGuiSettings.h"
/*! /*
\class UiGuiSettingsDialog \class UiGuiSettingsDialog
\ingroup grp_Settings \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. \brief The constructor calls the setup function for the ui created by uic.
*/ */
UiGuiSettingsDialog::UiGuiSettingsDialog(TQWidget *parent, UiGuiSettingsDialog::UiGuiSettingsDialog(TQWidget *parent,
@ -55,7 +55,7 @@ UiGuiSettingsDialog::UiGuiSettingsDialog(TQWidget *parent,
initTranslationSelection(); initTranslationSelection();
} }
/*! /*
\brief By calling this function the combobox for selecting the application language will \brief By calling this function the combobox for selecting the application language will
be initialized. be initialized.
@ -113,7 +113,7 @@ void UiGuiSettingsDialog::initTranslationSelection()
} }
} }
/*! /*
\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. Before it gets all the values needed from the UiGuiSettings object.
@ -127,7 +127,7 @@ int UiGuiSettingsDialog::showDialog()
return exec(); return exec();
} }
/*! /*
\brief This slot is called when the dialog box is closed by pressing the Ok button. \brief This slot is called when the dialog box is closed by pressing the Ok button.
Writes all settings to the UiGuiSettings object. Writes all settings to the UiGuiSettings object.
@ -138,7 +138,7 @@ void UiGuiSettingsDialog::writeWidgetValuesToSettings()
_settings->setSettingToObjectPropertyValueRecursive(this); _settings->setSettingToObjectPropertyValueRecursive(this);
} }
/*! /*
\brief Catches language change events and retranslates all needed widgets. \brief Catches language change events and retranslates all needed widgets.
*/ */
void UiGuiSettingsDialog::changeEvent(TQEvent *event) void UiGuiSettingsDialog::changeEvent(TQEvent *event)

@ -28,7 +28,7 @@ UiGuiSystemInfo::UiGuiSystemInfo()
{ {
} }
/*! /*
\brief Returns the operating system UiGUI is currently running on as one string. \brief Returns the operating system UiGUI is currently running on as one string.
The String contains name and version of the os. E.g. Linux Ubuntu 9.04. The String contains name and version of the os. E.g. Linux Ubuntu 9.04.

@ -19,26 +19,24 @@
#include "MainWindow.h" #include "MainWindow.h"
// -- #include "UiGuiIndentServer.h"
// -- #include "debugging/TSLogger.h" // -- #include "debugging/TSLogger.h"
// -- #include "UiGuiIniFileParser.h"
// -- #include "UiGuiSettings.h"
// -- #include "UiGuiSystemInfo.h"
// -- #include "IndentHandler.h" // -- #include "IndentHandler.h"
#include "SettingsPaths.h" #include "SettingsPaths.h"
// -- #include "UiGuiIndentServer.h"
// -- #include "UiGuiIniFileParser.h"
#include "UiGuiSettings.h"
// -- #include "UiGuiSystemInfo.h"
#include "UiGuiVersion.h"
#include <tqapplication.h> #include <tqapplication.h>
#include <tqtextcodec.h>
#include <tqglobal.h> #include <tqglobal.h>
// -- #include <string>
// -- #include <algorithm>
#include "UiGuiVersion.h"
#include <tqstring.h> #include <tqstring.h>
#include <tqtextcodec.h>
// -- #include <algorithm>
#include <iostream> #include <iostream>
// -- #include <string>
#include <tclap/CmdLine.h> #include <tclap/CmdLine.h>
// -- using namespace tschweitzer::debugging; // -- using namespace tschweitzer::debugging;
@ -179,7 +177,7 @@ int main(int argc, char *argv[])
// -- delete indentHandler; // -- delete indentHandler;
delete mainWindow; delete mainWindow;
SettingsPaths::cleanAndRemoveTempDir(); UiGuiSettings::deleteInstance();
// -- TSLogger::deleteInstance(); // -- TSLogger::deleteInstance();
return returnValue; return returnValue;

Loading…
Cancel
Save