Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents dee1bcb + e55b4d0 commit ac5b620a82fae8a1b9d86c7b0498088448679f7a Ken Moore committed Aug 22, 2013
@@ -34,6 +34,7 @@ void mainWin::ProgramInit(QString ch)
//username = QString::fromLocal8Bit(getenv("LOGNAME"));
connect(pushUpdatePkgs, SIGNAL(clicked()), this, SLOT(slotUpdatePkgsClicked()));
connect(pushClose, SIGNAL(clicked()), this, SLOT(slotCloseClicked()));
+ connect(pushCloseAdv, SIGNAL(clicked()), this, SLOT(slotCloseAdvClicked()));
connect(buttonRescanPkgs, SIGNAL(clicked()), this, SLOT(slotRescanPkgsClicked()));
connect(pushPkgApply, SIGNAL( clicked() ), this, SLOT( slotApplyClicked() ) );
connect(action_Quit, SIGNAL( triggered(bool) ), this, SLOT( slotCloseClicked() ) );
@@ -1421,3 +1422,8 @@ QString mainWin::getLineFromCommandOutput( QString cmd )
pclose(file);
return line.simplified();
}
+
+void mainWin::slotCloseAdvClicked()
+{
+ groupInfo->setVisible(false);
+}
@@ -63,6 +63,7 @@ private slots:
void slotCloseClicked();
// NG Packages
+ void slotCloseAdvClicked();
void slotGetNGPackageDataOutput();
void slotFinishLoadingNGPkgs();
void slotGetNGInstalledDataOutput();
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>641</height>
+ <height>644</height>
</rect>
</property>
<property name="windowTitle">
@@ -95,7 +95,38 @@
<string>Package Information</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="0" rowspan="3">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushCloseAdv">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="pc-pkgmanager.qrc">
+ <normaloff>:/window-close.png</normaloff>:/window-close.png</iconset>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
@@ -161,7 +192,7 @@
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
- <string>Dependances</string>
+ <string>Dependencies</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_13">
<item row="0" column="0">
@@ -428,7 +459,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>800</width>
- <height>20</height>
+ <height>22</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ac5b620

Please sign in to comment.