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

Move Info tab content to a separate widget.

Browse source 
Change-Id: I39a4e035372920f05f5fb3ab5bfc9459314997ad
This commit is contained in:
Dominik Riebeling 2012-02-19 18:06:56 +01:00
parent 93ed5baf77
commit 3aec87c009
7 changed files with 195 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

100
rbutil/rbutilqt/gui/infowidget.cpp Normal file
View file

@ -0,0 +1,100 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
*
* Copyright (C) 2012 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>
#include "infowidget.h"
#include "rbsettings.h"
InfoWidget::InfoWidget(QWidget *parent) : QWidget(parent)
{
ui.setupUi(this);
ui.treeInfo->setAlternatingRowColors(true);
ui.treeInfo->setHeaderLabels(QStringList() << tr("File") << tr("Version"));
ui.treeInfo->expandAll();
ui.treeInfo->setColumnCount(2);
ui.treeInfo->setLayoutDirection(Qt::LeftToRight);
}
void InfoWidget::updateInfo(void)
{
qDebug() << "[InfoWidget] updating server info";
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
QSettings log(mp + "/.rockbox/rbutil.log", QSettings::IniFormat, this);
QStringList groups = log.childGroups();
QList<QTreeWidgetItem *> items;
QTreeWidgetItem *w, *w2;
QString min, max;
int olditems = 0;
// remove old list entries (if any)
int l = ui.treeInfo->topLevelItemCount();
while(l--) {
QTreeWidgetItem *m;
m = ui.treeInfo->takeTopLevelItem(l);
// delete childs (single level deep, no recursion here)
int n = m->childCount();
while(n--)
delete m->child(n);
}
// get and populate new items
for(int a = 0; a < groups.size(); a++) {
log.beginGroup(groups.at(a));
QStringList keys = log.allKeys();
w = new QTreeWidgetItem;
w->setFlags(Qt::ItemIsEnabled);
w->setText(0, groups.at(a));
items.append(w);
// get minimum and maximum version information so we can hilight old files
min = max = log.value(keys.at(0)).toString();
for(int b = 0; b < keys.size(); b++) {
if(log.value(keys.at(b)).toString() > max)
max = log.value(keys.at(b)).toString();
if(log.value(keys.at(b)).toString() < min)
min = log.value(keys.at(b)).toString();
}
for(int b = 0; b < keys.size(); b++) {
QString file;
file = mp + "/" + keys.at(b);
if(QFileInfo(file).isDir())
continue;
w2 = new QTreeWidgetItem(w, QStringList() << "/"
+ keys.at(b) << log.value(keys.at(b)).toString());
if(log.value(keys.at(b)).toString() != max) {
w2->setForeground(0, QBrush(QColor(255, 0, 0)));
w2->setForeground(1, QBrush(QColor(255, 0, 0)));
olditems++;
}
items.append(w2);
}
log.endGroup();
if(min != max)
w->setData(1, Qt::DisplayRole, QString("%1 / %2").arg(min, max));
else
w->setData(1, Qt::DisplayRole, max);
}
ui.treeInfo->insertTopLevelItems(0, items);
ui.treeInfo->expandAll();
ui.treeInfo->resizeColumnToContents(0);
ui.treeInfo->collapseAll();
}

39
rbutil/rbutilqt/gui/infowidget.h Normal file
View file

@ -0,0 +1,39 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
*
* Copyright (C) 2012 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.
*
****************************************************************************/
#ifndef INFOWIDGET_H
#define INFOWIDGET_H
#include <QtGui>
#include "ui_infowidgetfrm.h"
class InfoWidget : public QWidget
{
Q_OBJECT
public:
InfoWidget(QWidget *parent = 0);
public slots:
void updateInfo(void);
private:
Ui::InfoWidgetFrm ui;
};
#endif

43
rbutil/rbutilqt/gui/infowidgetfrm.ui Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>InfoWidgetFrm</class>
<widget class="QWidget" name="InfoWidgetFrm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelInfo">
<property name="text">
<string>Currently installed packages.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; if you manually installed packages this might not be correct!</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QTreeWidget" name="treeInfo">
<column>
<property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

77
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -39,6 +39,7 @@
#include "systeminfo.h"
#include "ziputil.h"
#include "manualwidget.h"
#include "infowidget.h"
#include "progressloggerinterface.h"
@ -121,11 +122,11 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
mantablayout->addWidget(manual);
// info tab
ui.treeInfo->setAlternatingRowColors(true);
ui.treeInfo->setHeaderLabels(QStringList() << tr("File") << tr("Version"));
ui.treeInfo->expandAll();
ui.treeInfo->setColumnCount(2);
ui.treeInfo->setLayoutDirection(Qt::LeftToRight);
QGridLayout *infotablayout = new QGridLayout(this);
ui.info->setLayout(infotablayout);
info = new InfoWidget(this);
infotablayout->addWidget(info);
// disable quick install until version info is available
ui.buttonSmall->setEnabled(false);
ui.buttonComplete->setEnabled(false);
@ -205,7 +206,7 @@ void RbUtilQt::updateTabs(int count)
{
switch(count) {
case 6:
updateInfo();
info->updateInfo();
break;
default:
break;
@ -1135,70 +1136,6 @@ void RbUtilQt::installPortable(void)
}
void RbUtilQt::updateInfo()
{
qDebug() << "[RbUtil] updating server info";
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
QSettings log(mp + "/.rockbox/rbutil.log", QSettings::IniFormat, this);
QStringList groups = log.childGroups();
QList<QTreeWidgetItem *> items;
QTreeWidgetItem *w, *w2;
QString min, max;
int olditems = 0;
// remove old list entries (if any)
int l = ui.treeInfo->topLevelItemCount();
while(l--) {
QTreeWidgetItem *m;
m = ui.treeInfo->takeTopLevelItem(l);
// delete childs (single level deep, no recursion here)
int n = m->childCount();
while(n--)
delete m->child(n);
}
// get and populate new items
for(int a = 0; a < groups.size(); a++) {
log.beginGroup(groups.at(a));
QStringList keys = log.allKeys();
w = new QTreeWidgetItem;
w->setFlags(Qt::ItemIsEnabled);
w->setText(0, groups.at(a));
items.append(w);
// get minimum and maximum version information so we can hilight old files
min = max = log.value(keys.at(0)).toString();
for(int b = 0; b < keys.size(); b++) {
if(log.value(keys.at(b)).toString() > max)
max = log.value(keys.at(b)).toString();
if(log.value(keys.at(b)).toString() < min)
min = log.value(keys.at(b)).toString();
}
for(int b = 0; b < keys.size(); b++) {
QString file;
file = mp + "/" + keys.at(b);
if(QFileInfo(file).isDir())
continue;
w2 = new QTreeWidgetItem(w, QStringList() << "/"
+ keys.at(b) << log.value(keys.at(b)).toString());
if(log.value(keys.at(b)).toString() != max) {
w2->setForeground(0, QBrush(QColor(255, 0, 0)));
w2->setForeground(1, QBrush(QColor(255, 0, 0)));
olditems++;
}
items.append(w2);
}
log.endGroup();
if(min != max)
w->setData(1, Qt::DisplayRole, QString("%1 / %2").arg(min, max));
else
w->setData(1, Qt::DisplayRole, max);
}
ui.treeInfo->insertTopLevelItems(0, items);
ui.treeInfo->resizeColumnToContents(0);
}
QUrl RbUtilQt::proxy()
{
QUrl proxy;

3
rbutil/rbutilqt/rbutilqt.h
View file

@ -33,6 +33,7 @@
#include "progressloggergui.h"
#include "bootloaderinstallbase.h"
#include "manualwidget.h"
#include "infowidget.h"
class RbUtilQt : public QMainWindow
{
@ -45,6 +46,7 @@ class RbUtilQt : public QMainWindow
private:
ManualWidget *manual;
InfoWidget *info;
Ui::RbUtilQtFrm ui;
void changeEvent(QEvent *e);
@ -111,7 +113,6 @@ class RbUtilQt : public QMainWindow
void uninstall(void);
void uninstallBootloader(void);
void installPortable(void);
void updateInfo(void);
void updateTabs(int);
void checkUpdate(void);

3
rbutil/rbutilqt/rbutilqt.pri
View file

@ -18,6 +18,7 @@
# common files
SOURCES += \
gui/manualwidget.cpp \
gui/infowidget.cpp \
rbutilqt.cpp \
main.cpp \
installwindow.cpp \
@ -80,6 +81,7 @@ SOURCES += \
HEADERS += \
gui/manualwidget.h \
gui/infowidget.h \
rbutilqt.h \
installwindow.h \
base/httpget.h \
@ -149,6 +151,7 @@ HEADERS += \
FORMS += \
gui/manualwidgetfrm.ui \
gui/infowidgetfrm.ui \
rbutilqtfrm.ui \
aboutbox.ui \
installwindowfrm.ui \

27
rbutil/rbutilqt/rbutilqtfrm.ui
View file

@ -655,30 +655,6 @@
<attribute name="title">
<string>Inf&amp;o</string>
</attribute>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelInfo">
<property name="text">
<string>Currently installed packages.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; if you manually installed packages this might not be correct!</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QTreeWidget" name="treeInfo">
<column>
<property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
@ -690,7 +666,7 @@
<x>0</x>
<y>0</y>
<width>650</width>
<height>27</height>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@ -971,7 +947,6 @@
<tabstop>buttonVoice</tabstop>
<tabstop>buttonCreateVoice</tabstop>
<tabstop>buttonTalk</tabstop>
<tabstop>treeInfo</tabstop>
</tabstops>
<resources>
<include location="rbutilqt.qrc"/>