devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Do some minor cleanup.

Browse source 
- 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
This commit is contained in:
Dominik Riebeling 2012-07-01 15:02:32 +02:00
parent b7931594f9
commit e7fdf80c17
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

54
rbutil/rbutilqt/gui/comboboxviewdelegate.cpp Normal file
View file

@ -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();
}

30
rbutil/rbutilqt/gui/comboboxviewdelegate.h Normal file
View file

@ -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;
};

4
rbutil/rbutilqt/gui/infowidgetfrm.ui
View file

@ -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>

2
rbutil/rbutilqt/gui/manualwidgetfrm.ui
View file

@ -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">

12
rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
View file

@ -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();

2
rbutil/rbutilqt/gui/selectiveinstallwidgetfrm.ui
View file

@ -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">