Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:pcbsd/pcbsd
Browse files Browse the repository at this point in the history
  • Loading branch information
Kris Moore committed Aug 22, 2013
2 parents 793b028 + 80faf74 commit 55ef78f
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 81 deletions.
47 changes: 22 additions & 25 deletions src-qt4/pc-softwaremanager/mainUI.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ void MainUI::initializeInstalledTab(){
actionMenu->addAction( QIcon(":icons/dialog-cancel.png"), tr("Cancel Actions"), this, SLOT(slotActionCancel()) ); actionMenu->addAction( QIcon(":icons/dialog-cancel.png"), tr("Cancel Actions"), this, SLOT(slotActionCancel()) );
//Setup the binary menu for installed applications //Setup the binary menu for installed applications
appBinMenu = new QMenu(); appBinMenu = new QMenu();
ui->tool_install_icon->setMenu(appBinMenu); ui->tool_install_startApp->setMenu(appBinMenu);
connect(appBinMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotStartApp(QAction*)) ); connect(appBinMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotStartApp(QAction*)) );
//Now setup the action button //Now setup the action button
ui->tool_install_performaction->setMenu(actionMenu); ui->tool_install_performaction->setMenu(actionMenu);
ui->tool_install_performaction->setPopupMode(QToolButton::InstantPopup); ui->tool_install_performaction->setPopupMode(QToolButton::InstantPopup);
//Now setup any defaults for the installed tab //Now setup any defaults for the installed tab
ui->tool_install_gotobrowserpage->setEnabled(FALSE); //disable it until the browser is ready ui->tool_install_gotobrowserpage->setEnabled(FALSE); //disable it until the browser is ready
ui->tree_install_apps->setIconSize(QSize(22,22)); ui->tree_install_apps->setIconSize(QSize(22,22));
slotRefreshInstallTab(); slotRefreshInstallTab();
} }


void MainUI::formatInstalledItemDisplay(QTreeWidgetItem *item){ void MainUI::formatInstalledItemDisplay(QTreeWidgetItem *item){
Expand Down Expand Up @@ -491,7 +491,7 @@ void MainUI::slotUpdateSelectedPBI(bool statusonly){
else{ shortcuts = tr("None"); } else{ shortcuts = tr("None"); }
//Now display that info on the UI //Now display that info on the UI
ui->label_install_app->setText(vals[0]); ui->label_install_app->setText(vals[0]);
ui->tool_install_icon->setIcon( QIcon(vals[1]) ); ui->label_install_icon->setPixmap( QPixmap(vals[1]) );
if(vals[3].isEmpty()){ if(vals[3].isEmpty()){
ui->label_install_author->setText(vals[2]); ui->label_install_author->setText(vals[2]);
ui->label_install_author->setToolTip(""); ui->label_install_author->setToolTip("");
Expand All @@ -510,6 +510,7 @@ void MainUI::slotUpdateSelectedPBI(bool statusonly){
ui->tool_install_cancel->setVisible(TRUE); ui->tool_install_cancel->setVisible(TRUE);
ui->tool_install_remove->setVisible(FALSE); ui->tool_install_remove->setVisible(FALSE);
ui->tool_install_update->setVisible(FALSE); ui->tool_install_update->setVisible(FALSE);
ui->tool_install_startApp->setVisible(FALSE);
}else{ }else{
//Nothing pending //Nothing pending
ui->tool_install_cancel->setVisible(FALSE); ui->tool_install_cancel->setVisible(FALSE);
Expand All @@ -525,9 +526,21 @@ void MainUI::slotUpdateSelectedPBI(bool statusonly){
if(rootonly){ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small-root.png")); } if(rootonly){ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small-root.png")); }
else{ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small.png")); } else{ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small.png")); }
} }
//Start Application binaries
QStringList bins = PBI->pbiBinList(appID);
appBinMenu->clear();
for(int i=0; i<bins.length(); i++){
QAction *act = new QAction(this);
act->setText(bins[i].section("::::",0,0)); //set name
act->setWhatsThis(bins[i].section("::::",1,10)); //set command string
appBinMenu->addAction(act);
}
if(appBinMenu->isEmpty()){ ui->tool_install_startApp->setVisible(FALSE); }
else{ ui->tool_install_startApp->setVisible(TRUE); }
}else{ }else{
ui->tool_install_remove->setVisible(FALSE); ui->tool_install_remove->setVisible(FALSE);
ui->tool_install_update->setVisible(FALSE); ui->tool_install_update->setVisible(FALSE);
ui->tool_install_startApp->setVisible(FALSE);
} }
} }
} }
Expand Down Expand Up @@ -563,22 +576,6 @@ void MainUI::slotUpdateSelectedPBI(bool statusonly){
ui->progress_install_DL->setVisible(FALSE); ui->progress_install_DL->setVisible(FALSE);
ui->label_install_DL->setVisible(FALSE); ui->label_install_DL->setVisible(FALSE);
} }
if(!statusonly){
//Get the application binaries and set the icon to start them
QStringList bins = PBI->pbiBinList(appID);
appBinMenu->clear();
if(bins.isEmpty()){
ui->tool_install_icon->setAutoRaise(false);
}else{
ui->tool_install_icon->setAutoRaise(true);
for(int i=0; i<bins.length(); i++){
QAction *act = new QAction(this);
act->setText(bins[i].section("::::",0,0)); //set name
act->setWhatsThis(bins[i].section("::::",1,10)); //set command string
appBinMenu->addAction(act);
}
}
}
} }


// ========================== // ==========================
Expand Down
67 changes: 43 additions & 24 deletions src-qt4/pc-softwaremanager/mainUI.ui
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -202,6 +202,18 @@ border-radius: 5px;
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="1" rowspan="2"> <item row="1" column="1" rowspan="2">
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
Expand Down Expand Up @@ -274,38 +286,22 @@ border-radius: 5px;
<item row="1" column="0"> <item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
<item> <item>
<widget class="QToolButton" name="tool_install_icon"> <widget class="QLabel" name="label_install_icon">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>64</width> <width>64</width>
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="statusTip">
<string>Start the application</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="SoftwareManager.qrc"> <pixmap resource="SoftwareManager.qrc">:/icons/appcafe.png</pixmap>
<normaloff>:/icons/appcafe.png</normaloff>:/icons/appcafe.png</iconset>
</property> </property>
<property name="iconSize"> <property name="scaledContents">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="arrowType">
<enum>Qt::NoArrow</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
Expand All @@ -314,14 +310,31 @@ border-radius: 5px;
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QToolButton" name="tool_install_startApp">
<property name="statusTip">
<string>Start the application</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="SoftwareManager.qrc">
<normaloff>:/icons/application.png</normaloff>:/icons/application.png</iconset>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_7"> <spacer name="horizontalSpacer_7">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>10</width> <width>0</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
Expand Down Expand Up @@ -408,11 +421,17 @@ border-radius: 5px;
</item> </item>
<item> <item>
<widget class="QToolButton" name="tool_install_gotobrowserpage"> <widget class="QToolButton" name="tool_install_gotobrowserpage">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="statusTip"> <property name="statusTip">
<string>Open the browser page for the selected application</string> <string>Open the browser page for the selected application</string>
</property> </property>
<property name="text"> <property name="text">
<string>Open Browser</string> <string>Product Page</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="SoftwareManager.qrc"> <iconset resource="SoftwareManager.qrc">
Expand Down Expand Up @@ -1205,8 +1224,8 @@ spacing: 1px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>447</width> <width>98</width>
<height>61</height> <height>28</height>
</rect> </rect>
</property> </property>
</widget> </widget>
Expand Down
32 changes: 0 additions & 32 deletions src-qt4/pc-softwaremanager/processManager.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -188,38 +188,6 @@ QString ProcessManager::parseDlLine(QString line){
}else{ }else{
out.append("??"); out.append("??");
} }
/*
int i=0;
QStringList lab; lab << "KB" <<"MB"<<"GB"<<"TB"<<"PB";
while( (tot>1000) && (i<lab.length()) ){
cur=cur/1024; tot=tot/1024; i++;
}
cur = int(cur*10)/10.0;
tot = int(tot*10)/10.0;
if(totErr){ // cur==tot
//Percentage unknown (since fetch is not done)
out.append("??::"+QString::number(tot)+" "+lab[i]+"::");
//stats = QString::number(tot)+" "+lab[i];
}else{
out.append(QString::number(percent)+"::"+QString::number(tot)+" "+lab[i]+"::");
//stats = QString::number(cur)+"/"+QString::number(tot)+" "+lab[i]+" ("+QString::number(percent)+"%)";
}
// Format: <current>/<total> <size label> (<percent>%)
}else if(curok){
stats = Extras::sizeKToDisplay(QString::number(cur));
}
QString speed;
if(spdok){
speed = Extras::sizeKToDisplay(QString::number(spd))+"/s";
}
//Now put the output string together and return it
if(stats.isEmpty() && speed.isEmpty()){}
else if(stats.isEmpty()){ out = speed; }
else if(speed.isEmpty()){ out = stats; }
else{ out = QString( tr("%1 at %2") ).arg(stats,speed); }
*/
//qDebug() << " - Result:" << out;
return out; return out;
} }


Expand Down

0 comments on commit 55ef78f

Please sign in to comment.