Skip to content

Commit 5a0a8f1

Browse files
rahmanshaberrahmanshaber
committed
last min fixes
1 parent dbc3ff4 commit 5a0a8f1

File tree

25 files changed

+206
-172
lines changed

25 files changed

+206
-172
lines changed

‎app/app.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ isEqual( QT_MAJOR_VERSION, 5 ) {
268268
CONFIG += thread silent warn_off build_all
269269

270270
# Disable Debug on Release
271-
# CONFIG(release):DEFINES += QT_NO_DEBUG_OUTPUT
271+
CONFIG(release):DEFINES += QT_NO_DEBUG_OUTPUT
272272

273273
# Build location
274274

‎app/bookmarks/bookmarkdialog.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ void bookmarkDialog::checkPath()
8383
}
8484
}
8585

86-
void bookmarkDialog::setBookIcon(QPixmap pix) {
87-
ui->bkIcon->setPixmap(pix);
88-
}
89-
9086
void bookmarkDialog::setBookPath(const QString &path) {
9187
ui->path->setText(path);
9288
}

‎app/bookmarks/bookmarkdialog.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class bookmarkDialog : public QDialog
3838
~bookmarkDialog();
3939

4040
void checkPath();
41-
void setBookIcon(QPixmap pix);
4241
void setBookPath(const QString &path);
4342
void setBookName(const QString &bName);
4443
QString getBookName();

‎app/bookmarks/bookmarkdialog.ui‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>551</width>
9+
<width>482</width>
1010
<height>165</height>
1111
</rect>
1212
</property>
@@ -21,7 +21,7 @@
2121
<string notr="true"/>
2222
</property>
2323
<layout class="QGridLayout" name="gridLayout">
24-
<item row="2" column="2">
24+
<item row="2" column="1">
2525
<widget class="QLabel" name="path">
2626
<property name="text">
2727
<string>TextLabel</string>
@@ -31,34 +31,34 @@
3131
</property>
3232
</widget>
3333
</item>
34-
<item row="1" column="2">
34+
<item row="1" column="1">
3535
<widget class="QLineEdit" name="bkName"/>
3636
</item>
37-
<item row="2" column="1">
37+
<item row="2" column="0">
3838
<widget class="QLabel" name="Lpath">
3939
<property name="text">
4040
<string>Path :</string>
4141
</property>
4242
</widget>
4343
</item>
44-
<item row="0" column="1">
44+
<item row="0" column="0">
4545
<widget class="QLabel" name="LbkSection">
4646
<property name="text">
4747
<string>Section</string>
4848
</property>
4949
</widget>
5050
</item>
51-
<item row="0" column="2">
51+
<item row="0" column="1">
5252
<widget class="QComboBox" name="bkSection"/>
5353
</item>
54-
<item row="1" column="1">
54+
<item row="1" column="0">
5555
<widget class="QLabel" name="LbkName">
5656
<property name="text">
5757
<string>Bookmark Name :</string>
5858
</property>
5959
</widget>
6060
</item>
61-
<item row="3" column="1" colspan="2">
61+
<item row="3" column="0" colspan="2">
6262
<widget class="QLabel" name="bkStatus">
6363
<property name="styleSheet">
6464
<string notr="true">color: rgb(239, 41, 41);</string>
@@ -68,7 +68,7 @@
6868
</property>
6969
</widget>
7070
</item>
71-
<item row="4" column="1" colspan="2">
71+
<item row="4" column="0" colspan="2">
7272
<layout class="QHBoxLayout" name="horizontalLayout">
7373
<item>
7474
<spacer name="horizontalSpacer">
@@ -99,22 +99,6 @@
9999
</item>
100100
</layout>
101101
</item>
102-
<item row="0" column="0" rowspan="5">
103-
<widget class="QLabel" name="bkIcon">
104-
<property name="minimumSize">
105-
<size>
106-
<width>120</width>
107-
<height>120</height>
108-
</size>
109-
</property>
110-
<property name="text">
111-
<string>TextLabel</string>
112-
</property>
113-
<property name="scaledContents">
114-
<bool>true</bool>
115-
</property>
116-
</widget>
117-
</item>
118102
</layout>
119103
</widget>
120104
<layoutdefault spacing="6" margin="11"/>

‎app/bookmarks/bookmarks.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@ void bookmarks::callBookMarkDialog(QWidget *parent, const QString &currentPath)
101101
if (str.isEmpty() || str.isNull()) {
102102
bookmarkDialog *bkdlg = new bookmarkDialog(parent);
103103
QIcon ico = geticon(currentPath);
104-
QPixmap pix = ico.pixmap(QSize(120, 120));
104+
QPixmap pix = ico.pixmap(QSize(100, 80));
105105
bkdlg->setBookPath(currentPath);
106106
bkdlg->setBookName(info.fileName() + "");
107107
bkdlg->checkPath();
108-
bkdlg->setBookIcon(pix);
109108

110109
if (bkdlg->exec() == 0) {
111110
if (bkdlg->accepted) {

‎app/corearchiver/corearchiver.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void corearchiver::compress(const QStringList &archiveList , const QDir &current
8787

8888
QDir::setCurrent(currentDir.path());
8989

90-
qDebug() << "Current Dir : " << QDir::currentPath() << "\nGiven Dir : " << currentDir.path();
90+
// qDebug() << "Current Dir : " << QDir::currentPath() << "\nGiven Dir : " << currentDir.path();
9191

9292
if (archiveName.isEmpty()) return;
9393

@@ -100,11 +100,11 @@ void corearchiver::compress(const QStringList &archiveList , const QDir &current
100100
if ( arc == NULL )
101101
return;
102102

103-
qDebug() << "Info " << QDir(location).filePath(name);
104-
qDebug() << "Format : " << format;
105-
qDebug() << "Archive Name : " << name;
106-
qDebug() << "Working Dir : " << currentDir.path();
107-
qDebug() << "List Files : " << archiveList;
103+
// qDebug() << "Info " << QDir(location).filePath(name);
104+
// qDebug() << "Format : " << format;
105+
// qDebug() << "Archive Name : " << name;
106+
// qDebug() << "Working Dir : " << currentDir.path();
107+
// qDebug() << "List Files : " << archiveList;
108108
arc->setWorkingDir(currentDir.path());
109109
arc->updateInputFiles( archiveList );
110110
QFuture<void> f = QtConcurrent::run( arc, &LibArchive::create );

‎app/corebox/globalfunctions.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ bool moveToTrash(const QString &fileName) // moves a file or folder to trash fol
6666

6767
void setupFolder(FolderSetup fs)
6868
{
69-
qDebug() << "setupFolder";
7069
switch (fs) {
7170
case FolderSetup::BookmarkFolder: {
7271
// Setup corebox folder for bookmarks

‎app/corefm/renamedialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ along with this program; if not, see {http://www.gnu.org/licenses/}. */
1717
#include "renamedialog.h"
1818
#include "ui_renamedialog.h"
1919

20+
2021
renameDialog::renameDialog(QFileInfo iFile,QWidget *parent):QDialog(parent),ui(new Ui::renameDialog)
2122
{
2223
ui->setupUi(this);
@@ -30,7 +31,6 @@ renameDialog::renameDialog(QFileInfo iFile,QWidget *parent):QDialog(parent),ui(n
3031
setWindowIcon(geticon(m_iFile.filePath()));
3132
setWindowTitle("Rename \"" + m_iFile.fileName() + "\"");
3233
ui->newName->setText(m_iFile.fileName());
33-
ui->pic->setPixmap(geticon(iFile.filePath()).pixmap(120, 120));
3434
connect(ui->cancel, &QToolButton::clicked, this, &renameDialog::close);
3535

3636
shotcuts();

‎app/corefm/renamedialog.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class renameDialog : public QDialog
3939

4040
private slots:
4141
void on_done_clicked();
42-
4342
void on_newName_returnPressed();
4443

4544
private:

‎app/corefm/renamedialog.ui‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>443</width>
10-
<height>138</height>
9+
<width>361</width>
10+
<height>110</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -24,33 +24,17 @@
2424
<property name="spacing">
2525
<number>10</number>
2626
</property>
27-
<item row="0" column="0" rowspan="4">
28-
<widget class="QLabel" name="pic">
29-
<property name="minimumSize">
30-
<size>
31-
<width>120</width>
32-
<height>120</height>
33-
</size>
34-
</property>
35-
<property name="text">
36-
<string/>
37-
</property>
38-
<property name="scaledContents">
39-
<bool>true</bool>
40-
</property>
41-
</widget>
42-
</item>
43-
<item row="0" column="1">
27+
<item row="0" column="0">
4428
<widget class="QLabel" name="label_2">
4529
<property name="text">
4630
<string>Enter the new name : </string>
4731
</property>
4832
</widget>
4933
</item>
50-
<item row="1" column="1">
34+
<item row="1" column="0">
5135
<widget class="QLineEdit" name="newName"/>
5236
</item>
53-
<item row="3" column="1">
37+
<item row="3" column="0">
5438
<layout class="QHBoxLayout" name="horizontalLayout_2">
5539
<item>
5640
<spacer name="horizontalSpacer">
@@ -81,7 +65,7 @@
8165
</item>
8266
</layout>
8367
</item>
84-
<item row="2" column="1">
68+
<item row="2" column="0">
8569
<spacer name="verticalSpacer">
8670
<property name="orientation">
8771
<enum>Qt::Vertical</enum>

0 commit comments

Comments
 (0)