- enhancement: select icon sets in options dialog ( but we have only 1 icon set now...)
This commit is contained in:
Roy Qu
parent
641f834edf
commit
655bad6715
5
NEWS.md
5
NEWS.md
|
|
@ -1,3 +1,8 @@
|
|||
Version 0.12.2 For Dev-C++ 7 Beta
|
||||
- enhancement: auto find compiler sets in the PATH
|
||||
- change: path for iconsets
|
||||
- enhancement: select icon sets in options dialog ( but we have only 1 icon set now...)
|
||||
|
||||
Version 0.12.1 For Dev-C++ 7 Beta
|
||||
- fix: error when drag&drop in editors
|
||||
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -107,106 +107,107 @@
|
|||
<file>images/associations/obj.ico</file>
|
||||
<file>images/associations/rc.ico</file>
|
||||
<file>images/associations/template.ico</file>
|
||||
<file>images/editor/breakpoint.svg</file>
|
||||
<file>images/editor/bookmark.svg</file>
|
||||
<file>images/editor/currentline.svg</file>
|
||||
<file>images/editor/syntaxerror.svg</file>
|
||||
<file>images/editor/syntaxwarning.svg</file>
|
||||
<file>images/classparser/class.svg</file>
|
||||
<file>images/classparser/define.svg</file>
|
||||
<file>images/classparser/enum.svg</file>
|
||||
<file>images/classparser/global.svg</file>
|
||||
<file>images/classparser/global_method.svg</file>
|
||||
<file>images/classparser/method_inherited.svg</file>
|
||||
<file>images/classparser/method_inherited_protected.svg</file>
|
||||
<file>images/classparser/method_private.svg</file>
|
||||
<file>images/classparser/method_protected.svg</file>
|
||||
<file>images/classparser/method_public.svg</file>
|
||||
<file>images/classparser/namespace.svg</file>
|
||||
<file>images/classparser/static_method.svg</file>
|
||||
<file>images/classparser/static_var.svg</file>
|
||||
<file>images/classparser/type.svg</file>
|
||||
<file>images/classparser/var_inherited.svg</file>
|
||||
<file>images/classparser/var_inherited_protected.svg</file>
|
||||
<file>images/classparser/var_private.svg</file>
|
||||
<file>images/classparser/var_protected.svg</file>
|
||||
<file>images/classparser/var_public.svg</file>
|
||||
<file>images/newlook/01File-01New.svg</file>
|
||||
<file>images/newlook/01File-02Open.svg</file>
|
||||
<file>images/newlook/01File-03Save.svg</file>
|
||||
<file>images/newlook/01File-04SaveAs.svg</file>
|
||||
<file>images/newlook/01File-05SaveAll.svg</file>
|
||||
<file>images/newlook/01File-06Close.svg</file>
|
||||
<file>images/newlook/01File-07CloseAll.svg</file>
|
||||
<file>images/newlook/01File-08Print.svg</file>
|
||||
<file>images/newlook/01File-09Open_Folder.svg</file>
|
||||
<file>images/newlook/02Project_01New.svg</file>
|
||||
<file>images/newlook/02Project_02Save.svg</file>
|
||||
<file>images/newlook/02Project_03Close.svg</file>
|
||||
<file>images/newlook/02Project_04NewFile.svg</file>
|
||||
<file>images/newlook/02Project_05AddFile.svg</file>
|
||||
<file>images/newlook/02Project_06RemoveFile.svg</file>
|
||||
<file>images/newlook/02Project_07Properties.svg</file>
|
||||
<file>images/newlook/03Edit_01Undo.svg</file>
|
||||
<file>images/newlook/03Edit_02Redo.svg</file>
|
||||
<file>images/newlook/03Edit_03Cut.svg</file>
|
||||
<file>images/newlook/03Edit_04Copy.svg</file>
|
||||
<file>images/newlook/03Edit_05Paste.svg</file>
|
||||
<file>images/newlook/03Edit_06Indent.svg</file>
|
||||
<file>images/newlook/03Edit_07Unindent.svg</file>
|
||||
<file>images/newlook/03Edit_08Search.svg</file>
|
||||
<file>images/newlook/03Edit_09Replace.svg</file>
|
||||
<file>images/newlook/03Edit_10SearchInFiles.svg</file>
|
||||
<file>images/newlook/04Code-01Back.svg</file>
|
||||
<file>images/newlook/04Code-02Forward.svg</file>
|
||||
<file>images/newlook/04Code-03AddBookmark.svg</file>
|
||||
<file>images/newlook/04Code-04RemoveBookmark.svg</file>
|
||||
<file>images/newlook/04Code-05Reformat.svg</file>
|
||||
<file>images/newlook/05Run-01Compile.svg</file>
|
||||
<file>images/newlook/05Run-02CompileRun.svg</file>
|
||||
<file>images/newlook/05Run-03Run.svg</file>
|
||||
<file>images/newlook/05Run-04Rebuild.svg</file>
|
||||
<file>images/newlook/05Run-05Options.svg</file>
|
||||
<file>images/newlook/05Run-06Debug.svg</file>
|
||||
<file>images/newlook/05Run-07StepOver.svg</file>
|
||||
<file>images/newlook/05Run-08StepInto.svg</file>
|
||||
<file>images/newlook/05Run-08StepOut.svg</file>
|
||||
<file>images/newlook/05Run-09RunToCursor.svg</file>
|
||||
<file>images/newlook/05Run-10Continue.svg</file>
|
||||
<file>images/newlook/05Run-11Stop.svg</file>
|
||||
<file>images/newlook/05Run-12AddWatch.svg</file>
|
||||
<file>images/newlook/05Run-13RemoveWatch.svg</file>
|
||||
<file>images/newlook/00Misc-01Back.svg</file>
|
||||
<file>images/newlook/00Misc-02Forward.svg</file>
|
||||
<file>images/newlook/00Misc-03Add.svg</file>
|
||||
<file>images/newlook/00Misc-04Remove.svg</file>
|
||||
<file>images/newlook/00Misc-05Gear.svg</file>
|
||||
<file>images/newlook/00Misc-06Cross.svg</file>
|
||||
<file>images/newlook/00Misc-07Folder.svg</file>
|
||||
<file>images/newlook/00Misc-08Term.svg</file>
|
||||
<file>images/newlook/00Misc-09Clean.svg</file>
|
||||
<file>images/newlook/06View-01Maximum.svg</file>
|
||||
<file>images/newlook/07Help-01About.svg</file>
|
||||
<file>images/newlook/01File-10FileProperties.svg</file>
|
||||
<file>images/newlook/01File-11Locate.svg</file>
|
||||
<file>images/newlook/03Edit-11SortByName.svg</file>
|
||||
<file>images/newlook/03Edit-12SortByType.svg</file>
|
||||
<file>images/newlook/03Edit-13ShowInherited.svg</file>
|
||||
<file>images/newlook/06View-02ClassBrowser.svg</file>
|
||||
<file>images/newlook/08Problem_01Problem.svg</file>
|
||||
<file>images/newlook/08Problem_02ProblemSet.svg</file>
|
||||
<file>images/newlook/08Problem_03Properties.svg</file>
|
||||
<file>images/newlook/08Problem_04EditSource.svg</file>
|
||||
<file>images/newlook/08Problem_05RunCases.svg</file>
|
||||
<file>images/newlook/06View-03Files.svg</file>
|
||||
<file>images/newlook/06View-04CompileLog.svg</file>
|
||||
<file>images/newlook/06View-05Bookmark.svg</file>
|
||||
<file>images/newlook/06View-06Todo.svg</file>
|
||||
<file>images/newlook/05Run-14StepOverInstruction.svg</file>
|
||||
<file>images/newlook/05Run-15StepIntoInstruction.svg</file>
|
||||
<file>images/dark-close.svg</file>
|
||||
<file>images/newlook/00Misc-10Check.svg</file>
|
||||
<file>images/newlook/00Misc-11Rename.svg</file>
|
||||
<file>images/newlook/00Misc-12Help.svg</file>
|
||||
<file>images/newlook/classparser/class.svg</file>
|
||||
<file>images/newlook/classparser/define.svg</file>
|
||||
<file>images/newlook/classparser/enum.svg</file>
|
||||
<file>images/newlook/classparser/global.svg</file>
|
||||
<file>images/newlook/classparser/global_method.svg</file>
|
||||
<file>images/newlook/classparser/method_inherited.svg</file>
|
||||
<file>images/newlook/classparser/method_inherited_protected.svg</file>
|
||||
<file>images/newlook/classparser/method_private.svg</file>
|
||||
<file>images/newlook/classparser/method_protected.svg</file>
|
||||
<file>images/newlook/classparser/method_public.svg</file>
|
||||
<file>images/newlook/classparser/namespace.svg</file>
|
||||
<file>images/newlook/classparser/static_method.svg</file>
|
||||
<file>images/newlook/classparser/static_var.svg</file>
|
||||
<file>images/newlook/classparser/type.svg</file>
|
||||
<file>images/newlook/classparser/var_inherited.svg</file>
|
||||
<file>images/newlook/classparser/var_inherited_protected.svg</file>
|
||||
<file>images/newlook/classparser/var_private.svg</file>
|
||||
<file>images/newlook/classparser/var_protected.svg</file>
|
||||
<file>images/newlook/classparser/var_public.svg</file>
|
||||
<file>images/newlook/editor/bookmark.svg</file>
|
||||
<file>images/newlook/editor/breakpoint.svg</file>
|
||||
<file>images/newlook/editor/currentline.svg</file>
|
||||
<file>images/newlook/editor/syntaxerror.svg</file>
|
||||
<file>images/newlook/editor/syntaxwarning.svg</file>
|
||||
<file>images/newlook/actions/00Misc-01Back.svg</file>
|
||||
<file>images/newlook/actions/00Misc-02Forward.svg</file>
|
||||
<file>images/newlook/actions/00Misc-03Add.svg</file>
|
||||
<file>images/newlook/actions/00Misc-04Remove.svg</file>
|
||||
<file>images/newlook/actions/00Misc-05Gear.svg</file>
|
||||
<file>images/newlook/actions/00Misc-06Cross.svg</file>
|
||||
<file>images/newlook/actions/00Misc-07Folder.svg</file>
|
||||
<file>images/newlook/actions/00Misc-08Term.svg</file>
|
||||
<file>images/newlook/actions/00Misc-09Clean.svg</file>
|
||||
<file>images/newlook/actions/00Misc-10Check.svg</file>
|
||||
<file>images/newlook/actions/00Misc-11Rename.svg</file>
|
||||
<file>images/newlook/actions/00Misc-12Help.svg</file>
|
||||
<file>images/newlook/actions/01File-01New.svg</file>
|
||||
<file>images/newlook/actions/01File-02Open.svg</file>
|
||||
<file>images/newlook/actions/01File-03Save.svg</file>
|
||||
<file>images/newlook/actions/01File-04SaveAs.svg</file>
|
||||
<file>images/newlook/actions/01File-05SaveAll.svg</file>
|
||||
<file>images/newlook/actions/01File-06Close.svg</file>
|
||||
<file>images/newlook/actions/01File-07CloseAll.svg</file>
|
||||
<file>images/newlook/actions/01File-08Print.svg</file>
|
||||
<file>images/newlook/actions/01File-09Open_Folder.svg</file>
|
||||
<file>images/newlook/actions/01File-10FileProperties.svg</file>
|
||||
<file>images/newlook/actions/01File-11Locate.svg</file>
|
||||
<file>images/newlook/actions/02Project_01New.svg</file>
|
||||
<file>images/newlook/actions/02Project_02Save.svg</file>
|
||||
<file>images/newlook/actions/02Project_03Close.svg</file>
|
||||
<file>images/newlook/actions/02Project_04NewFile.svg</file>
|
||||
<file>images/newlook/actions/02Project_05AddFile.svg</file>
|
||||
<file>images/newlook/actions/02Project_06RemoveFile.svg</file>
|
||||
<file>images/newlook/actions/02Project_07Properties.svg</file>
|
||||
<file>images/newlook/actions/03Edit_01Undo.svg</file>
|
||||
<file>images/newlook/actions/03Edit_02Redo.svg</file>
|
||||
<file>images/newlook/actions/03Edit_03Cut.svg</file>
|
||||
<file>images/newlook/actions/03Edit_04Copy.svg</file>
|
||||
<file>images/newlook/actions/03Edit_05Paste.svg</file>
|
||||
<file>images/newlook/actions/03Edit_06Indent.svg</file>
|
||||
<file>images/newlook/actions/03Edit_07Unindent.svg</file>
|
||||
<file>images/newlook/actions/03Edit_08Search.svg</file>
|
||||
<file>images/newlook/actions/03Edit_09Replace.svg</file>
|
||||
<file>images/newlook/actions/03Edit_10SearchInFiles.svg</file>
|
||||
<file>images/newlook/actions/03Edit-11SortByName.svg</file>
|
||||
<file>images/newlook/actions/03Edit-12ShowInherited.svg</file>
|
||||
<file>images/newlook/actions/03Edit-12SortByType.svg</file>
|
||||
<file>images/newlook/actions/03Edit-13ShowInherited.svg</file>
|
||||
<file>images/newlook/actions/04Code-01Back.svg</file>
|
||||
<file>images/newlook/actions/04Code-02Forward.svg</file>
|
||||
<file>images/newlook/actions/04Code-03AddBookmark.svg</file>
|
||||
<file>images/newlook/actions/04Code-04RemoveBookmark.svg</file>
|
||||
<file>images/newlook/actions/04Code-05Reformat.svg</file>
|
||||
<file>images/newlook/actions/05Run-01Compile.svg</file>
|
||||
<file>images/newlook/actions/05Run-02CompileRun.svg</file>
|
||||
<file>images/newlook/actions/05Run-03Run.svg</file>
|
||||
<file>images/newlook/actions/05Run-04Rebuild.svg</file>
|
||||
<file>images/newlook/actions/05Run-05Options.svg</file>
|
||||
<file>images/newlook/actions/05Run-06Debug.svg</file>
|
||||
<file>images/newlook/actions/05Run-07StepOver.svg</file>
|
||||
<file>images/newlook/actions/05Run-08StepInto.svg</file>
|
||||
<file>images/newlook/actions/05Run-08StepOut.svg</file>
|
||||
<file>images/newlook/actions/05Run-09RunToCursor.svg</file>
|
||||
<file>images/newlook/actions/05Run-10Continue.svg</file>
|
||||
<file>images/newlook/actions/05Run-11Stop.svg</file>
|
||||
<file>images/newlook/actions/05Run-12AddWatch.svg</file>
|
||||
<file>images/newlook/actions/05Run-13RemoveWatch.svg</file>
|
||||
<file>images/newlook/actions/05Run-14StepOverInstruction.svg</file>
|
||||
<file>images/newlook/actions/05Run-15StepIntoInstruction.svg</file>
|
||||
<file>images/newlook/actions/06View-01Maximum.svg</file>
|
||||
<file>images/newlook/actions/06View-02ClassBrowser.svg</file>
|
||||
<file>images/newlook/actions/06View-03Files.svg</file>
|
||||
<file>images/newlook/actions/06View-04CompileLog.svg</file>
|
||||
<file>images/newlook/actions/06View-05Bookmark.svg</file>
|
||||
<file>images/newlook/actions/06View-06Todo.svg</file>
|
||||
<file>images/newlook/actions/07Help-01About.svg</file>
|
||||
<file>images/newlook/actions/08Problem_01Problem.svg</file>
|
||||
<file>images/newlook/actions/08Problem_02ProblemSet.svg</file>
|
||||
<file>images/newlook/actions/08Problem_03Properties.svg</file>
|
||||
<file>images/newlook/actions/08Problem_04EditSource.svg</file>
|
||||
<file>images/newlook/actions/08Problem_05RunCases.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ IconsManager::IconsManager(QObject *parent) : QObject(parent)
|
|||
|
||||
void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
|
||||
{
|
||||
QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
|
||||
QString iconFolder = QString(":/icons/images/%1/editor/").arg(iconSet);
|
||||
mIconPixmaps.insert(GUTTER_BREAKPOINT, createSVGIcon(iconFolder+"breakpoint.svg",size,size));
|
||||
mIconPixmaps.insert(GUTTER_SYNTAX_ERROR, createSVGIcon(iconFolder+"syntaxerror.svg",size,size));
|
||||
mIconPixmaps.insert(GUTTER_SYNTAX_WARNING,createSVGIcon(iconFolder+"syntaxwarning.svg",size,size));
|
||||
|
|
@ -26,7 +26,7 @@ void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
|
|||
|
||||
void IconsManager::updateParserIcons(const QString &iconSet, int size)
|
||||
{
|
||||
QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
|
||||
QString iconFolder = QString(":/icons/images/%1/classparser/").arg(iconSet);
|
||||
mIconPixmaps.insert(PARSER_TYPE, createSVGIcon(iconFolder+"type.svg",size,size));
|
||||
mIconPixmaps.insert(PARSER_CLASS, createSVGIcon(iconFolder+"class.svg",size,size));
|
||||
mIconPixmaps.insert(PARSER_NAMESPACE, createSVGIcon(iconFolder+"namespace.svg",size,size));
|
||||
|
|
@ -49,7 +49,7 @@ void IconsManager::updateParserIcons(const QString &iconSet, int size)
|
|||
|
||||
void IconsManager::updateActionIcons(const QString iconSet, int size)
|
||||
{
|
||||
QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
|
||||
QString iconFolder = QString(":/icons/images/%1/actions/").arg(iconSet);
|
||||
mActionIconSize = QSize(size,size);
|
||||
mIconPixmaps.insert(ACTION_MISC_BACK, createSVGIcon(iconFolder+"00Misc-01Back.svg",size,size));
|
||||
mIconPixmaps.insert(ACTION_MISC_FORWARD, createSVGIcon(iconFolder+"00Misc-02Forward.svg",size,size));
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ void MainWindow::updateForEncodingInfo() {
|
|||
|
||||
void MainWindow::updateEditorSettings()
|
||||
{
|
||||
pIconsManager->updateEditorGuttorIcons("editor",pointToPixel(pSettings->editor().fontSize()));
|
||||
pIconsManager->updateEditorGuttorIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->editor().fontSize()));
|
||||
mEditorList->applySettings();
|
||||
}
|
||||
|
||||
|
|
@ -550,7 +550,7 @@ void MainWindow::applySettings()
|
|||
font.setStyleStrategy(QFont::PreferAntialias);
|
||||
qApp->setFont(font);
|
||||
this->setFont(font);
|
||||
pIconsManager->updateParserIcons("classparser",pointToPixel(pSettings->environment().interfaceFontSize()));
|
||||
pIconsManager->updateParserIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->environment().interfaceFontSize()));
|
||||
|
||||
QFont caseEditorFont(pSettings->executor().caseEditorFontName());
|
||||
caseEditorFont.setPixelSize(pointToPixel(pSettings->executor().caseEditorFontSize()));
|
||||
|
|
@ -586,6 +586,8 @@ void MainWindow::applySettings()
|
|||
if (idxProblemSet>=0)
|
||||
ui->tabInfos->removeTab(idxProblemSet);
|
||||
}
|
||||
//icon sets for editors
|
||||
updateEditorSettings();
|
||||
updateDebuggerSettings();
|
||||
updateActionIcons();
|
||||
}
|
||||
|
|
@ -1100,7 +1102,7 @@ void MainWindow::updateDebuggerSettings()
|
|||
void MainWindow::updateActionIcons()
|
||||
{
|
||||
int size = pointToPixel(pSettings->environment().interfaceFontSize());
|
||||
pIconsManager->updateActionIcons("newlook", size);
|
||||
pIconsManager->updateActionIcons(pSettings->environment().iconSet(), size);
|
||||
QSize iconSize(size,size);
|
||||
ui->toolbarMain->setIconSize(iconSize);
|
||||
ui->toolbarCode->setIconSize(iconSize);
|
||||
|
|
|
|||
|
|
@ -2446,6 +2446,17 @@ void Settings::CompilerSets::findSets()
|
|||
clearSets();
|
||||
addSets(includeTrailingPathDelimiter(mSettings->dirs().app())+"MinGW32");
|
||||
addSets(includeTrailingPathDelimiter(mSettings->dirs().app())+"MinGW64");
|
||||
|
||||
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
||||
QString path = env.value("PATH");
|
||||
QStringList pathList = path.split(PATH_SEPARATOR);
|
||||
foreach (const QString& s, pathList){
|
||||
if (s.endsWith(QString(QDir::separator())+"bin")) {
|
||||
QString temp = s.mid(0,s.length()-4);
|
||||
qDebug()<<temp;
|
||||
addSets(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Settings::CompilerSets::saveSets()
|
||||
|
|
@ -2759,6 +2770,7 @@ void Settings::Environment::doLoad()
|
|||
mInterfaceFont = stringValue("interface_font",defaultFontName);
|
||||
mInterfaceFontSize = intValue("interface_font_size",10);
|
||||
mLanguage = stringValue("language", QLocale::system().name());
|
||||
mIconSet = stringValue("icon_set","newlook");
|
||||
|
||||
mCurrentFolder = stringValue("current_folder",QDir::currentPath());
|
||||
if (!fileExists(mCurrentFolder)) {
|
||||
|
|
@ -2810,6 +2822,16 @@ void Settings::Environment::setDefaultOpenFolder(const QString &newDefaultOpenFo
|
|||
mDefaultOpenFolder = newDefaultOpenFolder;
|
||||
}
|
||||
|
||||
const QString &Settings::Environment::iconSet() const
|
||||
{
|
||||
return mIconSet;
|
||||
}
|
||||
|
||||
void Settings::Environment::setIconSet(const QString &newIconSet)
|
||||
{
|
||||
mIconSet = newIconSet;
|
||||
}
|
||||
|
||||
void Settings::Environment::doSave()
|
||||
{
|
||||
//Appearence
|
||||
|
|
@ -2817,6 +2839,7 @@ void Settings::Environment::doSave()
|
|||
saveValue("interface_font", mInterfaceFont);
|
||||
saveValue("interface_font_size", mInterfaceFontSize);
|
||||
saveValue("language", mLanguage);
|
||||
saveValue("icon_set",mIconSet);
|
||||
|
||||
saveValue("current_folder",mCurrentFolder);
|
||||
saveValue("default_open_folder",mDefaultOpenFolder);
|
||||
|
|
|
|||
|
|
@ -484,6 +484,9 @@ public:
|
|||
const QString &defaultOpenFolder() const;
|
||||
void setDefaultOpenFolder(const QString &newDefaultOpenFolder);
|
||||
|
||||
const QString &iconSet() const;
|
||||
void setIconSet(const QString &newIconSet);
|
||||
|
||||
private:
|
||||
|
||||
//Appearence
|
||||
|
|
@ -492,6 +495,7 @@ public:
|
|||
int mInterfaceFontSize;
|
||||
QString mLanguage;
|
||||
QString mCurrentFolder;
|
||||
QString mIconSet;
|
||||
|
||||
QString mDefaultOpenFolder;
|
||||
// _Base interface
|
||||
|
|
|
|||
|
|
@ -20,8 +20,9 @@ EnvironmentAppearenceWidget::EnvironmentAppearenceWidget(const QString& name, co
|
|||
// for (QString name:factory.keys()) {
|
||||
// ui->cbTheme->addItem(name);
|
||||
// }
|
||||
ui->cbLanguage->addItem("English","en");
|
||||
ui->cbLanguage->addItem(tr("English"),"en");
|
||||
ui->cbLanguage->addItem(tr("Simplified Chinese"),"zh_CN");
|
||||
ui->cbIconSet->addItem("newlook");
|
||||
}
|
||||
|
||||
EnvironmentAppearenceWidget::~EnvironmentAppearenceWidget()
|
||||
|
|
@ -34,6 +35,7 @@ void EnvironmentAppearenceWidget::doLoad()
|
|||
ui->cbTheme->setCurrentText(pSettings->environment().theme());
|
||||
ui->cbFont->setCurrentFont(QFont(pSettings->environment().interfaceFont()));
|
||||
ui->spinFontSize->setValue(pSettings->environment().interfaceFontSize());
|
||||
ui->cbIconSet->setCurrentText(pSettings->environment().iconSet());
|
||||
|
||||
for (int i=0;i<ui->cbLanguage->count();i++) {
|
||||
if (ui->cbLanguage->itemData(i) == pSettings->environment().language()) {
|
||||
|
|
@ -57,7 +59,7 @@ void EnvironmentAppearenceWidget::doSave()
|
|||
pSettings->environment().setInterfaceFont(ui->cbFont->currentFont().family());
|
||||
pSettings->environment().setInterfaceFontSize(ui->spinFontSize->value());
|
||||
pSettings->environment().setLanguage(ui->cbLanguage->currentData().toString());
|
||||
|
||||
pSettings->environment().setIconSet(ui->cbIconSet->currentText());
|
||||
pSettings->editor().save();
|
||||
pSettings->environment().save();
|
||||
pMainWindow->applySettings();
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Font Size:</string>
|
||||
<string>Font:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<item row="6" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
|
|
@ -34,23 +34,9 @@
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Theme:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Font:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QWidget" name="widget" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item row="4" column="2">
|
||||
<widget class="QWidget" name="widget_4" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
|
|
@ -64,10 +50,17 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QComboBox" name="cbTheme"/>
|
||||
<widget class="QComboBox" name="cbLanguage"/>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>*Needs restart</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
|
|
@ -82,6 +75,13 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Theme:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QWidget" name="widget_2" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
|
|
@ -120,6 +120,54 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Language:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Font Size:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QWidget" name="widget" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QComboBox" name="cbTheme"/>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QWidget" name="widget_3" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
|
|
@ -155,15 +203,15 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Language:</string>
|
||||
<string>Icon Set:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QWidget" name="widget_4" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<widget class="QWidget" name="widget_5" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
|
|
@ -177,17 +225,10 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QComboBox" name="cbLanguage"/>
|
||||
<widget class="QComboBox" name="cbIconSet"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>*Needs restart</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
|
|
|
|||
Loading…
Reference in New Issue