summaryrefslogtreecommitdiff
path: root/src/frontend/settingsdialogs
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/settingsdialogs')
-rw-r--r--src/frontend/settingsdialogs/btlanguagesettings.cpp2
-rw-r--r--src/frontend/settingsdialogs/btshortcutseditor.cpp12
-rw-r--r--src/frontend/settingsdialogs/cswordsettings.cpp61
-rw-r--r--src/frontend/settingsdialogs/cswordsettings.h85
4 files changed, 93 insertions, 67 deletions
diff --git a/src/frontend/settingsdialogs/btlanguagesettings.cpp b/src/frontend/settingsdialogs/btlanguagesettings.cpp
index fdbe653..be2dd17 100644
--- a/src/frontend/settingsdialogs/btlanguagesettings.cpp
+++ b/src/frontend/settingsdialogs/btlanguagesettings.cpp
@@ -101,7 +101,7 @@ void BtLanguageSettingsPage::initSwordLocaleCombo() {
const std::list<sword::SWBuf> locales = sword::LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
for (SBLCI it = locales.begin(); it != locales.end(); ++it) {
- const char * abbreviation = sword::LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str())->getName();
+ const char * const abbreviation = sword::LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str())->getName();
const CLanguageMgr::Language * const l = CLanguageMgr::instance()->languageForAbbrev(abbreviation);
if (l->isValid()) {
diff --git a/src/frontend/settingsdialogs/btshortcutseditor.cpp b/src/frontend/settingsdialogs/btshortcutseditor.cpp
index d8fdfd8..618e5ed 100644
--- a/src/frontend/settingsdialogs/btshortcutseditor.cpp
+++ b/src/frontend/settingsdialogs/btshortcutseditor.cpp
@@ -204,7 +204,11 @@ QTableWidget* BtShortcutsEditor::createShortcutsTable() {
QStringList headerList;
headerList << tr("Action\nname") << tr("First\nshortcut") << tr("Second\nshortcut");
table->setHorizontalHeaderLabels(headerList);
+#if QT_VERSION < 0x050000
table->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
+#else
+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
+#endif
table->horizontalHeader()->resizeSection(0, 180);
table->horizontalHeader()->resizeSection(1, 100);
table->horizontalHeader()->setStretchLastSection(true);
@@ -223,7 +227,7 @@ void BtShortcutsEditor::changeRow(int row, int column) {
m_currentRow = row;
QKeySequence defaultKeys = item->getDefaultKeys();
- m_defaultLabelValue->setText(defaultKeys);
+ m_defaultLabelValue->setText(defaultKeys.toString());
QTableWidgetItem* item1 = m_table->item(row, 1);
QString shortcut = item1->text();
@@ -314,8 +318,8 @@ void BtShortcutsEditor::defaultButtonClicked(bool checked) {
QKeySequence defaultKeys = item->getDefaultKeys();
item->deleteHotkeys();
item->setFirstHotkey(defaultKeys);
- m_customPushButton->setText(defaultKeys);
- m_table->item(m_currentRow, 1)->setText(defaultKeys);
+ m_customPushButton->setText(defaultKeys.toString());
+ m_table->item(m_currentRow, 1)->setText(defaultKeys.toString());
m_table->item(m_currentRow, 2)->setText("");
}
@@ -370,7 +374,7 @@ void BtShortcutsEditor::clearConflictWithKeys(const QString& keys) {
}
if (m_table->item(row, 2)->text() == keys) {
m_table->item(row, 2)->setText("");
- item->setSecondHotkey(QKeySequence(""));
+ item->setSecondHotkey(QKeySequence("").toString());
}
}
}
diff --git a/src/frontend/settingsdialogs/cswordsettings.cpp b/src/frontend/settingsdialogs/cswordsettings.cpp
index 42c3833..60c0e7c 100644
--- a/src/frontend/settingsdialogs/cswordsettings.cpp
+++ b/src/frontend/settingsdialogs/cswordsettings.cpp
@@ -30,36 +30,6 @@
StandardWorksTab
*******************************************************************************/
-class StandardWorksTab: public QWidget {
-
- public: /* Methods: */
-
- StandardWorksTab(CSwordSettingsPage *parent);
-
- void save();
-
- protected: /* Methods: */
-
- void retranslateUi();
-
- private: /* Fields: */
-
- QLabel *m_explanationLabel;
-
-#define STANDARD_WORKS_TAB_FIELD(name) \
- QLabel *m_ ## name ## Label; \
- QComboBox *m_ ## name ## Combo
-
- STANDARD_WORKS_TAB_FIELD(standardBible);
- STANDARD_WORKS_TAB_FIELD(standardCommentary);
- STANDARD_WORKS_TAB_FIELD(standardLexicon);
- STANDARD_WORKS_TAB_FIELD(standardDailyDevotional);
- STANDARD_WORKS_TAB_FIELD(standardHebrewStrongsLexicon);
- STANDARD_WORKS_TAB_FIELD(standardGreekStrongsLexicon);
- STANDARD_WORKS_TAB_FIELD(standardHebrewMorphLexicon);
- STANDARD_WORKS_TAB_FIELD(standardGreekMorphLexicon);
-};
-
StandardWorksTab::StandardWorksTab(CSwordSettingsPage *parent)
: QWidget(parent)
{
@@ -264,36 +234,6 @@ void StandardWorksTab::retranslateUi() {
TextFiltersTab
*******************************************************************************/
-class TextFiltersTab: public QWidget {
-
- public: /* Methods: */
-
- TextFiltersTab(CSwordSettingsPage *parent);
-
- void save();
-
- protected: /* Methods: */
-
- void retranslateUi();
-
- private: /* Fields: */
-
- QLabel *m_explanationLabel;
-
-#define TEXT_FILTERS_TAB_FIELD(name) QCheckBox *m_ ## name ## Check
-
- TEXT_FILTERS_TAB_FIELD(lineBreaks);
- TEXT_FILTERS_TAB_FIELD(verseNumbers);
- TEXT_FILTERS_TAB_FIELD(headings);
- TEXT_FILTERS_TAB_FIELD(hebrewPoints);
- TEXT_FILTERS_TAB_FIELD(hebrewCantillation);
- TEXT_FILTERS_TAB_FIELD(morphSegmentation);
- TEXT_FILTERS_TAB_FIELD(greekAccents);
- TEXT_FILTERS_TAB_FIELD(textualVariants);
- TEXT_FILTERS_TAB_FIELD(scriptureReferences);
-
-};
-
TextFiltersTab::TextFiltersTab(CSwordSettingsPage *parent)
: QWidget(parent)
{
@@ -359,6 +299,7 @@ void TextFiltersTab::retranslateUi() {
m_textualVariantsCheck->setText(tr("Use textual variants"));
}
+
/*******************************************************************************
CSwordSettingsPage
*******************************************************************************/
diff --git a/src/frontend/settingsdialogs/cswordsettings.h b/src/frontend/settingsdialogs/cswordsettings.h
index 01f5829..c54630d 100644
--- a/src/frontend/settingsdialogs/cswordsettings.h
+++ b/src/frontend/settingsdialogs/cswordsettings.h
@@ -15,8 +15,89 @@
class CConfigurationDialog;
-class StandardWorksTab;
-class TextFiltersTab;
+class CSwordSettingsPage;
+class QCheckBox;
+class QComboBox;
+class QLabel;
+
+
+/*******************************************************************************
+ StandardWorksTab
+*******************************************************************************/
+
+class StandardWorksTab: public QWidget {
+
+ Q_OBJECT
+
+ public: /* Methods: */
+
+ StandardWorksTab(CSwordSettingsPage *parent);
+
+ void save();
+
+ protected: /* Methods: */
+
+ void retranslateUi();
+
+ private: /* Fields: */
+
+ QLabel *m_explanationLabel;
+
+#define STANDARD_WORKS_TAB_FIELD(name) \
+ QLabel *m_ ## name ## Label; \
+ QComboBox *m_ ## name ## Combo
+
+ STANDARD_WORKS_TAB_FIELD(standardBible);
+ STANDARD_WORKS_TAB_FIELD(standardCommentary);
+ STANDARD_WORKS_TAB_FIELD(standardLexicon);
+ STANDARD_WORKS_TAB_FIELD(standardDailyDevotional);
+ STANDARD_WORKS_TAB_FIELD(standardHebrewStrongsLexicon);
+ STANDARD_WORKS_TAB_FIELD(standardGreekStrongsLexicon);
+ STANDARD_WORKS_TAB_FIELD(standardHebrewMorphLexicon);
+ STANDARD_WORKS_TAB_FIELD(standardGreekMorphLexicon);
+};
+
+
+/*******************************************************************************
+ TextFiltersTab
+*******************************************************************************/
+
+class TextFiltersTab: public QWidget {
+
+ Q_OBJECT
+
+ public: /* Methods: */
+
+ TextFiltersTab(CSwordSettingsPage *parent);
+
+ void save();
+
+ protected: /* Methods: */
+
+ void retranslateUi();
+
+ private: /* Fields: */
+
+ QLabel *m_explanationLabel;
+
+#define TEXT_FILTERS_TAB_FIELD(name) QCheckBox *m_ ## name ## Check
+
+ TEXT_FILTERS_TAB_FIELD(lineBreaks);
+ TEXT_FILTERS_TAB_FIELD(verseNumbers);
+ TEXT_FILTERS_TAB_FIELD(headings);
+ TEXT_FILTERS_TAB_FIELD(hebrewPoints);
+ TEXT_FILTERS_TAB_FIELD(hebrewCantillation);
+ TEXT_FILTERS_TAB_FIELD(morphSegmentation);
+ TEXT_FILTERS_TAB_FIELD(greekAccents);
+ TEXT_FILTERS_TAB_FIELD(textualVariants);
+ TEXT_FILTERS_TAB_FIELD(scriptureReferences);
+
+};
+
+
+/*******************************************************************************
+ CSwordSettingsPage
+*******************************************************************************/
class CSwordSettingsPage: public BtConfigDialog::Page {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 08:42:30 +0000