ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: added setting for text encoding to preferences (issue #500)

Browse Source 
* also fixed offset of source locations behind multibyte characters
This commit is contained in:
mlangkabel
2017-11-02 12:40:50 +01:00
parent 8dbfa61234
commit f027b94dd4
10 changed files with 178 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+34 -12
View File
@@ -1,5 +1,7 @@
#include "qt/window/project_wizzard/QtProjectWizzardContentPreferences.h"
#include "qt/element/QtFontPicker.h"
#include "qt/element/QtTextEncodingPicker.h"
#include "qt/utility/utilityQt.h"
#include "settings/ApplicationSettings.h"
#include "utility/file/FileSystem.h"
@@ -39,17 +41,25 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
m_fontFace->setObjectName("name");
m_fontFace->setAttribute(Qt::WA_MacShowFocusRect, 0);
addLabelAndWidget("Font face", m_fontFace, layout, row);
addLabelAndWidget("Font Face", m_fontFace, layout, row);
row++;
// font size
m_fontSize = addComboBox("Font size", appSettings->getFontSizeMin(), appSettings->getFontSizeMax(), "", layout, row);
m_fontSize = addComboBox("Font Size", appSettings->getFontSizeMin(), appSettings->getFontSizeMax(), "", layout, row);
// tab width
m_tabWidth = addComboBox("Tab width", 1, 16, "", layout, row);
m_tabWidth = addComboBox("Tab Width", 1, 16, "", layout, row);
// text encoding
m_textEncoding = new QtTextEncodingPicker(this);
m_textEncoding->setObjectName("text encoding");
m_textEncoding->setAttribute(Qt::WA_MacShowFocusRect, 0);
addLabelAndWidget("Text Encoding", m_textEncoding, layout, row);
row++;
// color scheme
m_colorSchemes = addComboBox("Color scheme", 0, 0, "", layout, row);
m_colorSchemes = addComboBox("Color Scheme", "", layout, row);
for (size_t i = 0; i < m_colorSchemePaths.size(); i++)
{
m_colorSchemes->insertItem(i, m_colorSchemePaths[i].withoutExtension().fileName().c_str());
@@ -292,6 +302,8 @@ void QtProjectWizzardContentPreferences::load()
m_fontSize->setCurrentIndex(appSettings->getFontSize() - appSettings->getFontSizeMin());
m_tabWidth->setCurrentIndex(appSettings->getCodeTabWidth() - 1);
m_textEncoding->setText(QString::fromStdString(appSettings->getTextEncoding()));
FilePath colorSchemePath = appSettings->getColorSchemePath();
for (size_t i = 0; i < m_colorSchemePaths.size(); i++)
{
@@ -346,6 +358,8 @@ void QtProjectWizzardContentPreferences::save()
appSettings->setFontSize(m_fontSize->currentIndex() + appSettings->getFontSizeMin());
appSettings->setCodeTabWidth(m_tabWidth->currentIndex() + 1);
appSettings->setTextEncoding(m_textEncoding->getText().toStdString());
appSettings->setColorSchemePath(m_colorSchemePaths[m_colorSchemes->currentIndex()]);
m_oldColorSchemeIndex = -1;
@@ -578,11 +592,26 @@ QCheckBox* QtProjectWizzardContentPreferences::addCheckBox(
}
QComboBox* QtProjectWizzardContentPreferences::addComboBox(
QString label, int min, int max, QString helpText, QGridLayout* layout, int& row)
QString label, QString helpText, QGridLayout* layout, int& row)
{
QComboBox* comboBox = new QComboBox(this);
addLabelAndWidget(label, comboBox, layout, row, Qt::AlignLeft);
if (helpText.size())
{
addHelpButton(label, helpText, layout, row);
}
row++;
return comboBox;
}
QComboBox* QtProjectWizzardContentPreferences::addComboBox(
QString label, int min, int max, QString helpText, QGridLayout* layout, int& row)
{
QComboBox* comboBox = addComboBox(label, helpText, layout, row);
if (min != max)
{
for (int i = min; i <= max; i++)
@@ -591,13 +620,6 @@ QComboBox* QtProjectWizzardContentPreferences::addComboBox(
}
}
if (helpText.size())
{
addHelpButton(label, helpText, layout, row);
}
row++;
return comboBox;
}
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h
+5 -1
View File
@@ -6,12 +6,14 @@
#include <QLabel>
#include <QLineEdit>
#include "qt/element/QtFontPicker.h"
#include "qt/element/QtLocationPicker.h"
#include "qt/element/QtDirectoryListBox.h"
#include "qt/window/project_wizzard/QtProjectWizzardContent.h"
#include "utility/path_detector/CombinedPathDetector.h"
class QtFontPicker;
class QtTextEncodingPicker;
class QtProjectWizzardContentPreferences
: public QtProjectWizzardContent
{
@@ -47,12 +49,14 @@ private:
void addGap(QGridLayout* layout, int& row);
QCheckBox* addCheckBox(QString label, QString text, QString helpText, QGridLayout* layout, int& row);
QComboBox* addComboBox(QString label, QString helpText, QGridLayout* layout, int& row);
QComboBox* addComboBox(QString label, int min, int max, QString helpText, QGridLayout* layout, int& row);
QLineEdit* addLineEdit(QString label, QString helpText, QGridLayout* layout, int& row);
QtFontPicker* m_fontFace;
QComboBox* m_fontSize;
QComboBox* m_tabWidth;
QtTextEncodingPicker* m_textEncoding;
QComboBox* m_colorSchemes;
std::vector<FilePath> m_colorSchemePaths;