diff options
| -rw-r--r-- | backend.cpp | 12 | ||||
| -rw-r--r-- | backend/modules/install_configure | 14 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | listdelegate.cpp | 6 | ||||
| -rw-r--r-- | mainwizard.cpp | 2 |
5 files changed, 16 insertions, 20 deletions
diff --git a/backend.cpp b/backend.cpp index 977aaac..87a0145 100644 --- a/backend.cpp +++ b/backend.cpp @@ -9,7 +9,7 @@ Backend* Backend::_instance; Backend::Backend() { - qDebug("Backend::Backend() called!"); + qDebug() << "Backend::Backend() called!"; _process = new QProcess(); QTime time = QTime::currentTime(); @@ -85,7 +85,7 @@ void Backend::cfg(QString var, QString value) void Backend::exec(QString command) { - qDebug("Backend::exec(\""+command.toAscii()+"\") called!"); + qDebug() << "Backend::exec(\"" << command.toAscii() << "\") called!"; commandQueue.enqueue(command); dequeue(); } @@ -104,14 +104,14 @@ void Backend::dequeue() void Backend::exitBackend() { - qDebug("Backend::exitBackend() called!"); + qDebug() << "Backend::exitBackend() called!"; _process->kill(); _process->waitForFinished(); } void Backend::processOutput(QString line) { - qDebug("Backend: input: "+line.toAscii()); + qDebug() << "Backend: input:" << line.toAscii(); if(line.startsWith("<acritoxinstaller ")) { QString command = line.section(" ",1,1).section(">",0,0); @@ -119,7 +119,7 @@ void Backend::processOutput(QString line) if(command == "prompt") { busy = false; - qDebug("Backend: finished: "+currentCommand.toAscii()); + qDebug() << "Backend: finished:" << currentCommand.toAscii(); emit finishedCommand(currentCommand); dequeue(); } @@ -152,7 +152,7 @@ void Backend::processOutput(QString line) { data[currentData].append(line); emit receivedDataLine(currentData, line.trimmed()); - qDebug("Backend: data: "+line.toAscii()); + qDebug() << "Backend: data:" << line.toAscii(); } } diff --git a/backend/modules/install_configure b/backend/modules/install_configure index a78d576..114a958 100644 --- a/backend/modules/install_configure +++ b/backend/modules/install_configure @@ -131,6 +131,7 @@ function configure_target_purge_live_only_stuff() live-manual-pdf \ live-manual-txt \ live-manual \ + gfxoverlay \ mknbi \ syslinux \ tftpd-hpa &> /dev/null @@ -157,14 +158,9 @@ function configure_target_purge_live_only_stuff() rm -f "$TARGET/home/$cfg_username/.kde/shutdown/kdm-force-shutdown-hack" # remove live-only hooks - rm -vf $TARGET/usr/bin/isohybrid-bg2 \ - $TARGET/usr/share/initramfs-tools/hooks/pcidetect \ - $TARGET/usr/share/initramfs-tools/scripts/init-top/pcidetect \ - $TARGET/usr/share/initramfs-tools/scripts/live-bottom/01gfxoverlay \ - $TARGET/usr/share/initramfs-tools/scripts/live-bottom/02blacklist \ - $TARGET/usr/share/initramfs-tools/scripts/live-bottom/03rpmfirmware - rm -rvf $TARGET/lib/live - rm -vf $TARGET/etc/profile.d/zz-live.sh - rm -vf $TARGET/usr/local/bin/enable_persistent_live.bash + rm -rf $TARGET/lib/live + rm -f $TARGET/etc/profile.d/zz-live.sh + rm -f $TARGET/usr/local/bin/enable_persistent_live.bash + rm -f "$TARGET/home/$cfg_username/Desktop/enable_persistent.desktop" } diff --git a/debian/changelog b/debian/changelog index 6dc0ca5..90277d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -acritoxinstaller (0.2.25) trialshot; urgency=low +acritoxinstaller (0.2.25) dragonfire; urgency=low * remove enable_persistent script, mdadm raid support diff --git a/listdelegate.cpp b/listdelegate.cpp index 5777813..43388dc 100644 --- a/listdelegate.cpp +++ b/listdelegate.cpp @@ -55,9 +55,9 @@ void ListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, doc.setUseDesignMetrics(true); doc.setHtml("<p>"+description+"</p>"); QRectF rect = QRectF(QPoint(0,0),doc.size()); - painter->translate(74,20+QFontMetrics::QFontMetrics(f).height()); + painter->translate(74,20+QFontMetrics(f).height()); doc.drawContents(painter, rect); - painter->translate(-74,-20-QFontMetrics::QFontMetrics(f).height()); + painter->translate(-74,-20-QFontMetrics(f).height()); painter->restore(); } @@ -72,6 +72,6 @@ QSize ListDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd doc.setTextWidth(option.rect.width()-79); doc.setUseDesignMetrics(true); doc.setHtml("<p>"+description+"</p>"); - return QSize(option.rect.width()-10,std::max(69, int(25+QFontMetrics::QFontMetrics(f).height()+doc.size().height()))); + return QSize(option.rect.width()-10,std::max(69, int(25+QFontMetrics(f).height()+doc.size().height()))); } diff --git a/mainwizard.cpp b/mainwizard.cpp index bf4562b..903719c 100644 --- a/mainwizard.cpp +++ b/mainwizard.cpp @@ -56,7 +56,7 @@ void MainWizard::reject() void MainWizard::backendBusy(bool busy) { - qDebug((QString("MainWizard::backendBusy: ")+(busy ? "yes" : "no")).toUtf8()); + qDebug() << "MainWizard::backendBusy:" << (busy ? "yes" : "no"); if(!busy) { QApplication::restoreOverrideCursor(); |