From 7b1107d7f5273831dee7862d0500b8b2b14824ef Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Thu, 30 Jul 2015 10:09:21 +0200 Subject: [PATCH] Decrease height of citation dialog by using a QToolBox Fixes: #9618 --- src/frontends/qt4/GuiCitation.cpp | 11 + src/frontends/qt4/GuiCitation.h | 1 + src/frontends/qt4/ui/CitationUi.ui | 872 +++++++++++++++-------------- 3 files changed, 455 insertions(+), 429 deletions(-) diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp index 5a8e09dcde..483c8fb5b1 100644 --- a/src/frontends/qt4/GuiCitation.cpp +++ b/src/frontends/qt4/GuiCitation.cpp @@ -157,6 +157,17 @@ void GuiCitation::showEvent(QShowEvent * e) } +void GuiCitation::on_citationTB_currentChanged(int i) +{ + if (i == 0) + findLE->setFocus(); + else if (citationStyleCO->isEnabled()) + citationStyleCO->setFocus(); + else + textAfterED->setFocus(); +} + + void GuiCitation::on_okPB_clicked() { applyView(); diff --git a/src/frontends/qt4/GuiCitation.h b/src/frontends/qt4/GuiCitation.h index a604a18637..cc24eb9fc4 100644 --- a/src/frontends/qt4/GuiCitation.h +++ b/src/frontends/qt4/GuiCitation.h @@ -44,6 +44,7 @@ public: ~GuiCitation(); private Q_SLOTS: + void on_citationTB_currentChanged(int i); void on_okPB_clicked(); void on_cancelPB_clicked(); void on_restorePB_clicked(); diff --git a/src/frontends/qt4/ui/CitationUi.ui b/src/frontends/qt4/ui/CitationUi.ui index 7d03f62b37..bfbbc0de78 100644 --- a/src/frontends/qt4/ui/CitationUi.ui +++ b/src/frontends/qt4/ui/CitationUi.ui @@ -1,3 +1,4 @@ + CitationUi @@ -5,8 +6,8 @@ 0 0 - 449 - 487 + 590 + 506 @@ -15,152 +16,463 @@ true - - - - - 6 - - - 0 - + + + - - - A&vailable Citations: + + + 6 - - availableLV + + 0 - - - - - - Qt::Horizontal - - - - 71 - 20 - - - + + + + A&vailable Citations: + + + availableLV + + + + + + + Qt::Horizontal + + + + 71 + 20 + + + + + + + + S&elected Citations: + + + selectedLV + + + + - - - S&elected Citations: - - - selectedLV - - + + + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + Click or press Enter to add the selected citation to the list + + + &Add + + + false + + + + + + + Click or press Delete to delete the selected citation from the list + + + &Delete + + + false + + + + + + + Qt::Vertical + + + + 77 + 1 + + + + + + + + + 0 + 0 + + + + Move the selected citation up (Ctrl-Up) + + + &Up + + + + + + + + false + + + + + + + + 0 + 0 + + + + Move the selected citation down (Ctrl-Down) + + + Do&wn + + + + + + + + false + + + + + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + + 16777215 + 60 + + + + false + + + true + + + + - - - - QAbstractItemView::NoEditTriggers - - - - - - - Click or press Enter to add the selected citation to the list - - - &Add - - - false - - - - - - - QAbstractItemView::NoEditTriggers - - - - - - - Click or press Delete to delete the selected citation from the list - - - &Delete - - - false - - - - - - - Qt::Vertical - - - - 77 - 71 - - - - - - + + - + 0 0 - - Move the selected citation up (Ctrl-Up) + + - - &Up - - - - - - - - false - - - - - - - - 0 - 0 - - - - Move the selected citation down (Ctrl-Down) - - - Do&wn - - - - - - - - false + + 1 + + + + 0 + 0 + 572 + 111 + + + + &Search Citation + + + + + + Searc&h: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + findLE + + + + + + + Enter the text to search for and press Enter or click the button to search + + + + + + + + + + false + + + Click or press Enter in the search box to search + + + &Search + + + false + + + + + + + Search &field: + + + fieldsCO + + + + + + + 16 + + + QComboBox::NoInsert + + + QComboBox::AdjustToContents + + + + All fields + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Regular e&xpression + + + + + + + Case se&nsitive + + + + + + + Entry t&ypes: + + + entriesCO + + + + + + + QComboBox::NoInsert + + + QComboBox::AdjustToContents + + + + All entry types + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Search as you &type + + + + + + + + + 0 + 0 + 572 + 105 + + + + For&matting + + + + + + Citation st&yle: + + + citationStyleCO + + + + + + + Natbib citation style to use + + + + + + + Text &before: + + + textBeforeED + + + + + + + Text to place before citation + + + + + + + &Text after: + + + textAfterED + + + + + + + Text to place after citation + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + + 21 + 20 + + + + + + + + List all authors + + + &Full author list + + + + + + + Force upper case in citation + + + Force u&pper case + + + + + + + - + 6 @@ -226,295 +538,7 @@ - - - - false - - - true - - - - 60 - 16777215 - - - - - - - - Formatting - - - true - - - - - - Citation st&yle: - - - citationStyleCO - - - - - - - Natbib citation style to use - - - - - - - Text &before: - - - textBeforeED - - - - - - - Text to place before citation - - - - - - - Text a&fter: - - - textAfterED - - - - - - - Text to place after citation - - - - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - - 21 - 20 - - - - - - - - List all authors - - - Full aut&hor list - - - - - - - Force upper case in citation - - - Force u&pper case - - - - - - - - - - - - Search Citation - - - true - - - - 9 - - - 6 - - - - - Searc&h: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - findLE - - - - - - - Enter the text to search for and press Enter or click the button to search - - - - - - - - - - false - - - Click or press Enter in the search box to search - - - &Search - - - false - - - - - - - Search field: - - - fieldsCO - - - - - - - 16 - - - QComboBox::NoInsert - - - QComboBox::AdjustToContents - - - - All fields - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Regular e&xpression - - - - - - - Case se&nsitive - - - - - - - Entry types: - - - entriesCO - - - - - - - QComboBox::NoInsert - - - QComboBox::AdjustToContents - - - - All entry types - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Search as you &type - - - - - - - availableLV - addPB - selectedLV - deletePB - upPB - downPB - infoML - styleGB - groupBox availableLV @@ -524,16 +548,6 @@ downPB selectedLV infoML - findLE - searchPB - fieldsCO - entriesCO - regexCB - caseCB - asTypeCB - citationStyleCO - textBeforeED - textAfterED fulllistCB forceuppercaseCB restorePB -- 2.39.2