[fwbuilder-commits] r3290 - in branches/v4_1: . src/gui

[<va...@in...>]

Author: vadim
Date: 2010-09-30 09:23:03 -0700 (Thu, 30 Sep 2010)
New Revision: 3290

Modified:
   branches/v4_1/build_num
   branches/v4_1/src/gui/InterfaceEditorWidget.cpp
Log:
no quotes in the input field placeholder text

Modified: branches/v4_1/build_num
===================================================================
--- branches/v4_1/build_num	2010-09-30 00:27:17 UTC (rev 3289)
+++ branches/v4_1/build_num	2010-09-30 16:23:03 UTC (rev 3290)
@@ -1 +1 @@
-#define BUILD_NUM 3287
+#define BUILD_NUM 3289

Modified: branches/v4_1/src/gui/InterfaceEditorWidget.cpp
===================================================================
--- branches/v4_1/src/gui/InterfaceEditorWidget.cpp	2010-09-30 00:27:17 UTC (rev 3289)
+++ branches/v4_1/src/gui/InterfaceEditorWidget.cpp	2010-09-30 16:23:03 UTC (rev 3290)
@@ -46,8 +46,8 @@
     this->m_ui->label->setText(interfacep->getLabel().c_str());
 
 #if (QT_VERSION >= 0x040700)
-    this->m_ui->name->setPlaceholderText(tr("\"eth0\", \"en0\", \"FastEthernet0/0\" etc"));
-    this->m_ui->label->setPlaceholderText(tr("\"outside\", \"inside\" etc"));
+    this->m_ui->name->setPlaceholderText(tr("eth0, en0, FastEthernet0/0, etc"));
+    this->m_ui->label->setPlaceholderText(tr("outside, inside, etc"));
 #endif
 
     if (iface->getPhysicalAddress() != NULL)
@@ -91,8 +91,8 @@
     this->m_ui->label->setText(data.label);
 
 #if (QT_VERSION >= 0x040700)
-    this->m_ui->name->setPlaceholderText(tr("\"eth0\", \"en0\", \"FastEthernet0/0\" etc"));
-    this->m_ui->label->setPlaceholderText(tr("\"outside\", \"inside\" etc"));
+    this->m_ui->name->setPlaceholderText(tr("eth0, en0, FastEthernet0/0, etc"));
+    this->m_ui->label->setPlaceholderText(tr("outside, inside, etc"));
 #endif
 
     this->m_ui->comment->setText(data.comment);
@@ -121,8 +121,8 @@
     this->m_ui->label->setText(data->label.c_str());
 
 #if (QT_VERSION >= 0x040700)
-    this->m_ui->name->setPlaceholderText(tr("\"eth0\", \"en0\", \"FastEthernet0/0\" etc"));
-    this->m_ui->label->setPlaceholderText(tr("\"outside\", \"inside\" etc"));
+    this->m_ui->name->setPlaceholderText(tr("eth0, en0, FastEthernet0/0, etc"));
+    this->m_ui->label->setPlaceholderText(tr("outside, inside, etc"));
 #endif
 
     this->m_ui->mac->setText(data->mac_addr.c_str());
@@ -159,8 +159,8 @@
     this->m_ui->label->clear();
 
 #if (QT_VERSION >= 0x040700)
-    this->m_ui->name->setPlaceholderText(tr("\"eth0\", \"en0\", \"FastEthernet0/0\" etc"));
-    this->m_ui->label->setPlaceholderText(tr("\"outside\", \"inside\" etc"));
+    this->m_ui->name->setPlaceholderText(tr("eth0, en0, FastEthernet0/0, etc"));
+    this->m_ui->label->setPlaceholderText(tr("outside, inside, etc"));
 #endif
 
     this->m_ui->comment->clear();
@@ -364,7 +364,7 @@
                "<br/> "
                "<br/>"
                "Interface name must match the name of the physical interface, "
-               "such as 'eth0', 'fxp0', 'ethernet0' etc</html>"),
+               "such as 'eth0', 'fxp0', 'ethernet0', etc</html>"),
             "&Continue", QString::null, QString::null, 0, 1 );
         return false;
     }