Группа :: Архивирование/Прочее
Пакет: AcetoneISO2
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: acetoneiso2-port_to_qt5.patch
Скачать
Скачать
Port code to Qt 5
Based on ideas taken from:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784449#31
http://sophie.zarb.org/rpms/ccf75da2539311195750bf02728b3e2c/files/8
Author: Nick Andrik <nick.andrik@gmail.com>
Index: b/acetoneiso/acetoneiso.pro
===================================================================
--- a/acetoneiso/acetoneiso.pro
+++ b/acetoneiso/acetoneiso.pro
@@ -1,8 +1,8 @@
CONFIG += qt
TEMPLATE = app
-TARGET =
+TARGET = acetoneiso
DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . /usr/include/phonon4qt5/KDE
# Input
HEADERS += sources/acetoneiso.h \
@@ -57,10 +57,10 @@ SOURCES += sources/acetoneiso.cpp source
RESOURCES = acetoneiso.qrc
-#QT += phonon
+#LIBS += -lphonon4qt5
QT += dbus
#QT += svg
-QT += webkit
+QT += webkitwidgets
#install#
target.path = /usr/bin
Index: b/acetoneiso/sources/a_options.h
===================================================================
--- a/acetoneiso/sources/a_options.h
+++ b/acetoneiso/sources/a_options.h
@@ -16,7 +16,7 @@
#include"options.h"
#include"acetoneiso.h"
//#include"../acetoneiso.h"
-#include <QtGui>
+#include <QtWidgets>
void optionsDiag::optionss()
{Index: b/acetoneiso/sources/about.cpp
===================================================================
--- a/acetoneiso/sources/about.cpp
+++ b/acetoneiso/sources/about.cpp
@@ -15,8 +15,8 @@
#include "about.h"
//
-aboutDiag::aboutDiag( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+aboutDiag::aboutDiag( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
}
Index: b/acetoneiso/sources/about.h
===================================================================
--- a/acetoneiso/sources/about.h
+++ b/acetoneiso/sources/about.h
@@ -22,7 +22,7 @@ class aboutDiag : public QDialog, public
{Q_OBJECT
public:
- aboutDiag( QWidget * parent = 0, Qt::WFlags f = 0 );
+ aboutDiag( QWidget * parent = 0 );
};
#endif
Index: b/acetoneiso/sources/acetoneiso.cpp
===================================================================
--- a/acetoneiso/sources/acetoneiso.cpp
+++ b/acetoneiso/sources/acetoneiso.cpp
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with AcetoneISO. If not, see <http://www.gnu.org/licenses/>.
-#include <QtGui>
+#include <QtWidgets>
#include <QTabWidget>
#include <QThread>
#include <QWebView>
@@ -243,7 +243,7 @@ void acetoneiso::closeProg()
prog.close();
}
-void acetoneiso::on_options_nda_activated()
+void acetoneiso::on_options_nda_triggered()
{QMainWindow::showNormal();
optionsDiag *opt=new optionsDiag;
@@ -260,7 +260,7 @@ void acetoneiso::call_database_options()
QTextStream out_adv(&advanced);
out_adv << ( "must call option directly in database settings\n" );
advanced.close();
-on_options_nda_activated();
+on_options_nda_triggered();
}
@@ -295,20 +295,20 @@ if( !file.exists() ) {file.close();
advanced.remove();
QMessageBox::warning(this, "AcetoneISO::First Launch",tr("This is the first time you launch AcetoneISO software.\nIn the next dialog you can set your default file manager, set database and some other things.\nHappy AcetoneISO usage from the team:)"));-on_options_nda_activated();
+on_options_nda_triggered();
}
}
-void acetoneiso::on_actionAbout_activated()
+void acetoneiso::on_actionAbout_triggered()
{QMainWindow::showNormal();
aboutDiag *abt=new aboutDiag;
abt->exec();
}
-void acetoneiso::on_actionManual_activated()
+void acetoneiso::on_actionManual_triggered()
{manualDiag *man=new manualDiag;
man->exec();
Index: b/acetoneiso/sources/burn_iso_2_cd.cpp
===================================================================
--- a/acetoneiso/sources/burn_iso_2_cd.cpp
+++ b/acetoneiso/sources/burn_iso_2_cd.cpp
@@ -13,7 +13,7 @@
//
// You should have received a copy of the GNU General Public License
// along with AcetoneISO. If not, see <http://www.gnu.org/licenses/>.
-#include <QtGui>
+#include <QtWidgets>
#include <QFileDialog>
#include <QCoreApplication>
#include <QByteArray>
@@ -38,8 +38,8 @@ dice il tipo di media inserito: hal-get-
*/
//
-burniso2cd::burniso2cd( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+burniso2cd::burniso2cd( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
Index: b/acetoneiso/sources/burn_iso_2_cd.h
===================================================================
--- a/acetoneiso/sources/burn_iso_2_cd.h
+++ b/acetoneiso/sources/burn_iso_2_cd.h
@@ -29,7 +29,7 @@ class burniso2cd : public QDialog, publi
{Q_OBJECT
public:
- burniso2cd( QWidget * parent = 0, Qt::WFlags f = 0 );
+ burniso2cd( QWidget * parent = 0 );
QStringList device_path;
QStringList id_device;
QByteArray erase_output;
Index: b/acetoneiso/sources/burn_iso_2_dvd.cpp
===================================================================
--- a/acetoneiso/sources/burn_iso_2_dvd.cpp
+++ b/acetoneiso/sources/burn_iso_2_dvd.cpp
@@ -13,7 +13,7 @@
//
// You should have received a copy of the GNU General Public License
// along with AcetoneISO. If not, see <http://www.gnu.org/licenses/>.
-#include <QtGui>
+#include <QtWidgets>
#include <QByteArray>
#include <QProcess>
#include <QDBusConnection>
@@ -29,8 +29,8 @@
//
-burniso2dvd::burniso2dvd( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+burniso2dvd::burniso2dvd( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
Index: b/acetoneiso/sources/burn_iso_2_dvd.h
===================================================================
--- a/acetoneiso/sources/burn_iso_2_dvd.h
+++ b/acetoneiso/sources/burn_iso_2_dvd.h
@@ -28,7 +28,7 @@ class burniso2dvd : public QDialog, publ
{Q_OBJECT
public:
- burniso2dvd( QWidget * parent = 0, Qt::WFlags f = 0 );
+ burniso2dvd( QWidget * parent = 0 );
QStringList device_path;
QStringList id_device;
QByteArray erase_output;
Index: b/acetoneiso/sources/erase_cd.cpp
===================================================================
--- a/acetoneiso/sources/erase_cd.cpp
+++ b/acetoneiso/sources/erase_cd.cpp
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with AcetoneISO. If not, see <http://www.gnu.org/licenses/>.
-#include <QtGui>
+#include <QtWidgets>
#include <QCoreApplication>
#include <QByteArray>
#include <QProcess>
@@ -31,8 +31,8 @@ dice il tipo di media inserito: hal-get-
*/
//
-erasecd::erasecd( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+erasecd::erasecd( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
Index: b/acetoneiso/sources/erase_cd.h
===================================================================
--- a/acetoneiso/sources/erase_cd.h
+++ b/acetoneiso/sources/erase_cd.h
@@ -28,7 +28,7 @@ class erasecd : public QDialog, public U
{Q_OBJECT
public:
- erasecd( QWidget * parent = 0, Qt::WFlags f = 0 );
+ erasecd( QWidget * parent = 0 );
QStringList device_path;
QStringList id_device;
QByteArray erase_output;
Index: b/acetoneiso/sources/erase_dvd.cpp
===================================================================
--- a/acetoneiso/sources/erase_dvd.cpp
+++ b/acetoneiso/sources/erase_dvd.cpp
@@ -13,7 +13,7 @@
//
// You should have received a copy of the GNU General Public License
// along with AcetoneISO. If not, see <http://www.gnu.org/licenses/>.
-#include <QtGui>
+#include <QtWidgets>
#include <QByteArray>
#include <QProcess>
#include <QDBusConnection>
@@ -33,8 +33,8 @@ dice il tipo di media inserito: hal-get-
*/
//
-erasedvd::erasedvd( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+erasedvd::erasedvd( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
Index: b/acetoneiso/sources/erase_dvd.h
===================================================================
--- a/acetoneiso/sources/erase_dvd.h
+++ b/acetoneiso/sources/erase_dvd.h
@@ -27,7 +27,7 @@ class erasedvd : public QDialog, public
{Q_OBJECT
public:
- erasedvd( QWidget * parent = 0, Qt::WFlags f = 0 );
+ erasedvd( QWidget * parent = 0 );
QStringList device_path;
QStringList id_device;
QByteArray erase_output;
Index: b/acetoneiso/sources/formatcd.h
===================================================================
--- a/acetoneiso/sources/formatcd.h
+++ b/acetoneiso/sources/formatcd.h
@@ -87,7 +87,7 @@ msgBox.exec();
if (msgBox.clickedButton() == connectButton) {umountcheck();
bool ok;
- int i = QInputDialog::getInteger(this, tr("AcetoneISO::Erase Speed"),tr("Please insert the erasing speed:"), 4, 2, 16, 2, &ok);+ int i = QInputDialog::getInt(this, tr("AcetoneISO::Erase Speed"),tr("Please insert the erasing speed:"), 4, 2, 16, 2, &ok); if (!ok) {}
else {Index: b/acetoneiso/sources/isocd.h
===================================================================
--- a/acetoneiso/sources/isocd.h
+++ b/acetoneiso/sources/isocd.h
@@ -20,7 +20,7 @@ QString text = QInputDialog::getText(thi
"/dev/cdrom", &ok);
if (ok && !text.isEmpty()) {bool ok2;
- int i = QInputDialog::getInteger(this, tr("AcetoneISO::Byte Size"),tr("Please insert the Byte Size.\nLeaving default is the best solution!"), 1024, 0, 100000, 2, &ok2);+ int i = QInputDialog::getInt(this, tr("AcetoneISO::Byte Size"),tr("Please insert the Byte Size.\nLeaving default is the best solution!"), 1024, 0, 100000, 2, &ok2); if (!ok2) {return;
}
Index: b/acetoneiso/sources/manual.cpp
===================================================================
--- a/acetoneiso/sources/manual.cpp
+++ b/acetoneiso/sources/manual.cpp
@@ -15,8 +15,8 @@
#include "manual.h"
//
-manualDiag::manualDiag( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+manualDiag::manualDiag( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
Index: b/acetoneiso/sources/manual.h
===================================================================
--- a/acetoneiso/sources/manual.h
+++ b/acetoneiso/sources/manual.h
@@ -23,7 +23,7 @@ class manualDiag : public QDialog, publi
{Q_OBJECT
public:
- manualDiag( QWidget * parent = 0, Qt::WFlags f = 0 );
+ manualDiag( QWidget * parent = 0 );
};
#endif
Index: b/acetoneiso/sources/options.cpp
===================================================================
--- a/acetoneiso/sources/options.cpp
+++ b/acetoneiso/sources/options.cpp
@@ -15,8 +15,8 @@
#include "options.h"
#include"a_options.h"
//
-optionsDiag::optionsDiag( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+optionsDiag::optionsDiag( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
Index: b/acetoneiso/sources/options.h
===================================================================
--- a/acetoneiso/sources/options.h
+++ b/acetoneiso/sources/options.h
@@ -22,7 +22,7 @@ class optionsDiag : public QDialog, publ
{Q_OBJECT
public:
- optionsDiag( QWidget * parent = 0, Qt::WFlags f = 0 );
+ optionsDiag( QWidget * parent = 0 );
private slots:
void optionss();
void update_options();
Index: b/acetoneiso/sources/progress.cpp
===================================================================
--- a/acetoneiso/sources/progress.cpp
+++ b/acetoneiso/sources/progress.cpp
@@ -15,8 +15,8 @@
#include "progress.h"
//
-progressDiag::progressDiag( QWidget * parent, Qt::WFlags f)
- : QDialog(parent, f)
+progressDiag::progressDiag( QWidget * parent )
+ : QDialog(parent)
{setupUi(this);
}
Index: b/acetoneiso/sources/progress.h
===================================================================
--- a/acetoneiso/sources/progress.h
+++ b/acetoneiso/sources/progress.h
@@ -23,7 +23,7 @@ class progressDiag : public QDialog, pub
{Q_OBJECT
public:
- progressDiag( QWidget * parent = 0, Qt::WFlags f = 0 );
+ progressDiag( QWidget * parent = 0 );
};
#endif
Index: b/acetoneiso/sources/split.h
===================================================================
--- a/acetoneiso/sources/split.h
+++ b/acetoneiso/sources/split.h
@@ -33,7 +33,7 @@ void acetoneiso::split()
}
bool ok;
- int i = QInputDialog::getInteger(this, tr("AcetoneISO::Split number"),tr("Please insert the volume number in MegaByte:"), 99, 1, 100000, 1, &ok);+ int i = QInputDialog::getInt(this, tr("AcetoneISO::Split number"),tr("Please insert the volume number in MegaByte:"), 99, 1, 100000, 1, &ok); if (!ok) {return;
}
Index: b/acetoneiso/sources/vidgen.h
===================================================================
--- a/acetoneiso/sources/vidgen.h
+++ b/acetoneiso/sources/vidgen.h
@@ -32,7 +32,7 @@ if ( !open.isNull() ) { tr("Video (*.avi)")); if ( !fileName.isNull() ) {bool ok;
- int i = QInputDialog::getInteger(this, tr("AcetoneISO::Fixed Quant"),tr("Please insert the Fixed Quant number.\nLowering the number will result in a higher quality video."), 7, 2, 13, 1, &ok);+ int i = QInputDialog::getInt(this, tr("AcetoneISO::Fixed Quant"),tr("Please insert the Fixed Quant number.\nLowering the number will result in a higher quality video."), 7, 2, 13, 1, &ok); if (!ok) {return;
}
@@ -145,7 +145,7 @@ int valore_uscita = RIp->exitCode();
if(valore_uscita == 0) { QMessageBox::information(this, "AcetoneISO",tr("Encoding Pass 1 has succesfully finished.\nPass 2 will be done now. Please choose the bitrate in the next dialog and then choose where to save the video."));bool ok;
- int i = QInputDialog::getInteger(this, tr("AcetoneISO::Bitrate"),tr("Please insert Bitrate. Higher bitrate means more quality but will generate a bigger file."), 896, 384, 4096, 128, &ok);+ int i = QInputDialog::getInt(this, tr("AcetoneISO::Bitrate"),tr("Please insert Bitrate. Higher bitrate means more quality but will generate a bigger file."), 896, 384, 4096, 128, &ok); if (!ok) {return;
}
Index: b/acetoneiso/sources/acetoneiso.h
===================================================================
--- a/acetoneiso/sources/acetoneiso.h
+++ b/acetoneiso/sources/acetoneiso.h
@@ -141,10 +141,10 @@ private slots:
void mergeMSG(int, QProcess::ExitStatus);
void Monta( QString &image, QString &destination );
void openBrowser( QString &destination, QString onlyfile, float divide, QString &temporary, QString image_with_path );
- void on_options_nda_activated();
+ void on_options_nda_triggered();
void createOption();
- void on_actionAbout_activated();
- void on_actionManual_activated();
+ void on_actionAbout_triggered();
+ void on_actionManual_triggered();
void printOutvidgen(int, QProcess::ExitStatus);
void printOutflv(int, QProcess::ExitStatus);
void printOututube(int, QProcess::ExitStatus);
Index: b/acetoneiso/sources/global_functions.h
===================================================================
--- a/acetoneiso/sources/global_functions.h
+++ b/acetoneiso/sources/global_functions.h
@@ -216,9 +216,9 @@ void acetoneiso::remove_virtual_drives()
//carico tray icon
void acetoneiso::load_trayicon() { AboutAction = new QAction(tr("About AcetoneISO"), this);- connect(AboutAction, SIGNAL(triggered()), this, SLOT(on_actionAbout_activated() ));
+ connect(AboutAction, SIGNAL(triggered()), this, SLOT(on_actionAbout_triggered() ));
OptionsAction = new QAction(tr("Options"), this);- connect(OptionsAction, SIGNAL(triggered()), this, SLOT(on_options_nda_activated() ));
+ connect(OptionsAction, SIGNAL(triggered()), this, SLOT(on_options_nda_triggered() ));
MountAction = new QAction(tr("Mount Image"), this);connect(MountAction, SIGNAL(triggered()), this, SLOT(mount()));
Index: b/README
===================================================================
--- a/README
+++ b/README
@@ -17,13 +17,13 @@ This software is brought to you from | r
SYSTEM REQUIREMENTS:
- fuseiso
- fuse-utils
-- libqt4-gui 4.5 and libqtwebkit 4.5 or later
+- libqt5gui5 and ibqt5webkit5
- genisoimage (may be part of cdrkit package)
- cdrdao
- p7zip-full
- gnupg-agent
- gnupg2
-- pinentry-qt4
+- pinentry-qt
- ffmpeg
- mencoder
- cdparanoia
@@ -34,12 +34,12 @@ Note for 64bit users: the package "ia32-
############################# INSTALL #############################################
-a) You must have libqt4-dev 4.5 and libphonon-dev or later and the standard gcc compiler (gcc,g++,make) installed.
+a) You must have qttools5-dev-tools, libqt5webkit5-dev, and libphonon4qt5-dev and the standard gcc compiler (gcc,g++,make) installed.
b) open a terminal inside acetoneiso folder and type:
- qmake-qt4 (if it gives errors simply type "qmake" instead)
+ qmake-qt5 (if it gives errors simply type "qmake" instead)
make
make install (must be run as root user)