diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 15:02:32 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-07-01 15:02:32 +0200 |
commit | e7fdf80c175c9dd6a86fbe29556ac6ef7bd8ed29 (patch) | |
tree | 5a7ca6941bfbca9a9ce9cd171690fa39533bad3e /rbutil/rbutilqt/gui | |
parent | b7931594f9b9a55ba58b4087ab08a4e820e66e7b (diff) | |
download | rockbox-e7fdf80c175c9dd6a86fbe29556ac6ef7bd8ed29.tar.gz rockbox-e7fdf80c175c9dd6a86fbe29556ac6ef7bd8ed29.zip |
Do some minor cleanup.
- Move a GUI-only implementation class around.
- Make some strings non-translatable which don't make sense translating.
- Rename internal state in installation class. There is no current build
anymore.
Change-Id: I7384c5601de36bc48f858fe5c7b009653d439d94
Diffstat (limited to 'rbutil/rbutilqt/gui')
-rw-r--r-- | rbutil/rbutilqt/gui/comboboxviewdelegate.cpp | 54 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/comboboxviewdelegate.h | 30 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/infowidgetfrm.ui | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/manualwidgetfrm.ui | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui | 2 |
6 files changed, 94 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp new file mode 100644 index 0000000000..189f71c95e --- /dev/null +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.cpp @@ -0,0 +1,54 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2011 by Dominik Riebeling + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include <QtGui> +#include <qdebug.h> +#include "comboboxviewdelegate.h" + +void ComboBoxViewDelegate::paint(QPainter *painter, + const QStyleOptionViewItem &option, const QModelIndex &index) const +{ + QPen pen; + QFont font; + pen = painter->pen(); + font = painter->font(); + + painter->save(); + // paint selection + if(option.state & QStyle::State_Selected) { + painter->setPen(QPen(Qt::NoPen)); + painter->setBrush(QApplication::palette().highlight()); + painter->drawRect(option.rect); + painter->restore(); + painter->save(); + pen.setColor(QApplication::palette().color(QPalette::HighlightedText)); + } + else { + pen.setColor(QApplication::palette().color(QPalette::Text)); + } + // draw data (text) + painter->setPen(pen); + painter->drawText(option.rect, Qt::AlignLeft, index.data().toString()); + + // draw user data right aligned, italic + font.setItalic(true); + painter->setFont(font); + painter->drawText(option.rect, Qt::AlignRight, index.data(Qt::UserRole).toString()); + painter->restore(); +} + diff --git a/rbutil/rbutilqt/gui/comboboxviewdelegate.h b/rbutil/rbutilqt/gui/comboboxviewdelegate.h new file mode 100644 index 0000000000..40f6b07d02 --- /dev/null +++ b/rbutil/rbutilqt/gui/comboboxviewdelegate.h @@ -0,0 +1,30 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2011 by Dominik Riebeling + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include <QtGui> + +class ComboBoxViewDelegate : public QStyledItemDelegate +{ + Q_OBJECT + public: + ComboBoxViewDelegate(QObject* parent = 0) : QStyledItemDelegate(parent) { } + + void paint(QPainter *painter, const QStyleOptionViewItem &option, + const QModelIndex &index) const; +}; + diff --git a/rbutil/rbutilqt/gui/infowidgetfrm.ui b/rbutil/rbutilqt/gui/infowidgetfrm.ui index 41ac46f8dc..8c7fdb30f7 100644 --- a/rbutil/rbutilqt/gui/infowidgetfrm.ui +++ b/rbutil/rbutilqt/gui/infowidgetfrm.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string>Info</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> @@ -31,7 +31,7 @@ <widget class="QTreeWidget" name="treeInfo"> <column> <property name="text"> - <string>1</string> + <string>Package</string> </property> </column> </widget> diff --git a/rbutil/rbutilqt/gui/manualwidgetfrm.ui b/rbutil/rbutilqt/gui/manualwidgetfrm.ui index 8757c4569e..add26736c9 100644 --- a/rbutil/rbutilqt/gui/manualwidgetfrm.ui +++ b/rbutil/rbutilqt/gui/manualwidgetfrm.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string>Manual</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index dbbe4afb4d..ec8ce1cc64 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp @@ -63,7 +63,7 @@ void SelectiveInstallWidget::selectedVersionChanged(int index) if(current == "release") ui.selectedDescription->setText(tr("This is the latest stable " "release available.")); - if(current == "current") + if(current == "development") ui.selectedDescription->setText(tr("The development version is " "updated on every code change. Last update was on %1").arg( ServerInfo::value(ServerInfo::BleedingDate).toString())); @@ -89,7 +89,7 @@ void SelectiveInstallWidget::updateVersion(void) // re-populate all version items m_versions.clear(); m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); - m_versions.insert("current", ServerInfo::value(ServerInfo::BleedingRevision).toString()); + m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString()); m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString()); ui.selectedVersion->clear(); @@ -97,9 +97,9 @@ void SelectiveInstallWidget::updateVersion(void) ui.selectedVersion->addItem(tr("Stable Release (Version %1)").arg( m_versions["release"]), "release"); } - if(!m_versions["current"].isEmpty()) { + if(!m_versions["development"].isEmpty()) { ui.selectedVersion->addItem(tr("Development Version (Revison %1)").arg( - m_versions["current"]), "current"); + m_versions["development"]), "development"); } if(!m_versions["rc"].isEmpty()) { ui.selectedVersion->addItem(tr("Release Candidate (Revison %1)").arg( @@ -116,7 +116,7 @@ void SelectiveInstallWidget::updateVersion(void) ui.selectedVersion->setCurrentIndex(index); } else { - index = ui.selectedVersion->findData("current"); + index = ui.selectedVersion->findData("development"); ui.selectedVersion->setCurrentIndex(index); } // check if Rockbox is installed. If it is untick the bootloader option, as @@ -377,7 +377,7 @@ void SelectiveInstallWidget::installRockbox(void) if(selected == "release") url = ServerInfo::platformValue(m_target, ServerInfo::CurReleaseUrl).toString(); - else if(selected == "current") url = ServerInfo::platformValue(m_target, + else if(selected == "development") url = ServerInfo::platformValue(m_target, ServerInfo::CurDevelUrl).toString(); else if(selected == "rc") url = ServerInfo::platformValue(m_target, ServerInfo::RelCandidateUrl).toString(); diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui b/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui index 25cf44ba90..65a6f18620 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui +++ b/rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui @@ -17,7 +17,7 @@ </sizepolicy> </property> <property name="windowTitle"> - <string>Form</string> + <string>Selective Installation</string> </property> <layout class="QGridLayout" name="gridLayout_3"> <item row="0" column="0"> |