パネル自体の背景色を変更

[gefu/Gefu.git] / overwritedialog.cpp

diff --git a/overwritedialog.cpp b/overwritedialog.cpp
index b5dc44e..9aa56c1 100644 (file)
--- a/overwritedialog.cpp
+++ b/overwritedialog.cpp
@@ -1,11 +1,10 @@
-#include "common.h"\r
+#include "preferences.h"\r
 #include "overwritedialog.h"\r
 #include "ui_overwritedialog.h"\r
 \r
 #include <QDir>\r
 #include <QMessageBox>\r
 #include <QDateTime>\r
-#include <QSettings>\r
 \r
 OverWriteDialog::OverWriteDialog(QWidget *parent) :\r
     QDialog(parent),\r
@@ -32,13 +31,15 @@ OverWriteDialog::~OverWriteDialog()
 \r
 void OverWriteDialog::reset()\r
 {\r
-    QSettings settings;\r
-    QString method = settings.value(IniKey_DefaultOnCopy).toString();\r
-    QRadioButton *radio = findChild<QRadioButton*>(method);\r
+    QString method = Preferences(this).getCopyBehavior();\r
+    QRadioButton *radio = findChild<QRadioButton*>("rb" + method);\r
     if (radio == NULL) {\r
         radio = ui->rbOverWriteIfNew;\r
     }\r
     radio->setChecked(true);\r
+    if (radio != ui->rbRename) {\r
+        ui->lineEdit->setEnabled(false);\r
+    }\r
 \r
     ui->keepSetting->setChecked(false);\r
 }\r
@@ -58,7 +59,7 @@ void OverWriteDialog::setFileInfo(const QString srcPath, const QString tgtPath)
     QTableWidgetItem *iTgtName = new QTableWidgetItem(tgtInfo.fileName());\r
     iTgtName->setFlags(iTgtName->flags() ^ Qt::ItemIsEditable);\r
     iTgtName->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);\r
-    ui->tableWidget->setItem(0, 0, iTgtName);\r
+    ui->tableWidget->setItem(1, 0, iTgtName);\r
 \r
     QTableWidgetItem *iSrcSize = new QTableWidgetItem(tr("%1 Bytes").arg(srcInfo.size()));\r
     iSrcSize->setFlags(iSrcSize->flags() ^ Qt::ItemIsEditable);\r