[PC-BSD Commits] r141 - pcbsd/trunk/pcbsdusermanager

svn at pcbsd.org svn at pcbsd.org
Thu Mar 15 13:56:22 PST 2007


Author: tim
Date: 2007-03-15 22:56:22 +0100 (Thu, 15 Mar 2007)
New Revision: 141

Modified:
   pcbsd/trunk/pcbsdusermanager/1leftarrow.png
   pcbsd/trunk/pcbsdusermanager/adddlgcode.cpp
   pcbsd/trunk/pcbsdusermanager/changepasscode.cpp
   pcbsd/trunk/pcbsdusermanager/mainDlg.ui
   pcbsd/trunk/pcbsdusermanager/maindlgcode.cpp
   pcbsd/trunk/pcbsdusermanager/simpleaddcode.cpp
   pcbsd/trunk/pcbsdusermanager/simpledlgcode.cpp
   pcbsd/trunk/pcbsdusermanager/usermanagerback.cpp
Log:
Fixed all compilation warnings & altered arrows displayed on 'Group' tab

Modified: pcbsd/trunk/pcbsdusermanager/1leftarrow.png
===================================================================
(Binary files differ)

Modified: pcbsd/trunk/pcbsdusermanager/adddlgcode.cpp
===================================================================
--- pcbsd/trunk/pcbsdusermanager/adddlgcode.cpp	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/adddlgcode.cpp	2007-03-15 21:56:22 UTC (rev 141)
@@ -75,7 +75,7 @@
     QString username = usernameBox->text().lower();
     usernameBox->setText(username);
     
-    QString groupText = i18n("New Group");
+    QString groupText = tr("New Group");
     if (username != "")
     {
 	groupText+=" (";
@@ -95,20 +95,20 @@
     int usernameError = back->validateUsername(username);
     
     QColor usernameBoxColour = white;
-    QToolTip::add(usernameBox, i18n("Good Input"));
+    QToolTip::add(usernameBox, tr("Good Input"));
     
     switch (usernameError) 
     {
     case 1:
-	QToolTip::add(usernameBox, i18n("The field is empty"));
+	QToolTip::add(usernameBox, tr("The field is empty"));
 	break;
     case 2:
 	usernameBoxColour = red;
-	QToolTip::add(usernameBox, i18n("This field can only accept letters and numbers"));
+	QToolTip::add(usernameBox, tr("This field can only accept letters and numbers"));
 	break;
     case 3:
 	usernameBoxColour = red;
-	QToolTip::add(usernameBox, i18n("This username is already in use, please choose another."));
+	QToolTip::add(usernameBox, tr("This username is already in use, please choose another."));
     }
     
     usernameBox->setPaletteBackgroundColor(usernameBoxColour);
@@ -119,7 +119,7 @@
     int passError = back->validatePassword(passBox->text(), confirmPassBox->text());
     
     QColor passBoxColour = white;
-    QToolTip::add(passBox, i18n("Passwords match"));
+    QToolTip::add(passBox, tr("Passwords match"));
     
     switch (passError)
     {
@@ -128,11 +128,11 @@
 	break;
     case 2:
         passBoxColour = red;
-	QToolTip::add(passBox, i18n("Passwords do not match"));
+	QToolTip::add(passBox, tr("Passwords do not match"));
 	break;
     case 3:
         passBoxColour = red;
-        QToolTip::add(passBox, i18n("Invalid input"));
+        QToolTip::add(passBox, tr("Invalid input"));
     }
     
     passBox->setPaletteBackgroundColor(passBoxColour);
@@ -143,16 +143,16 @@
     int fullnameError = back->validateFullname(fullnameBox->text());
     
     QColor fullnameBoxColour = white;
-    QToolTip::add(fullnameBox, i18n("Good Input"));
+    QToolTip::add(fullnameBox, tr("Good Input"));
     
     switch(fullnameError)
     {
     case 1:
-	QToolTip::add(fullnameBox, i18n("The field is empty"));
+	QToolTip::add(fullnameBox, tr("The field is empty"));
 	break;
     case 2:
 	fullnameBoxColour = red;
-	QToolTip::add(fullnameBox, i18n("This field may not contain ! @ or :"));
+	QToolTip::add(fullnameBox, tr("This field may not contain ! @ or :"));
 	break;
     }
     
@@ -164,27 +164,27 @@
     int homeError = back->validateHome(homeBox->lineEdit()->text());
     
     QColor homeBoxColour = white;
-    QToolTip::add(homeBox, i18n("Directory will be used"));
+    QToolTip::add(homeBox, tr("Directory will be used"));
     
     switch (homeError)
     {
     case 1:
-	QToolTip::add(homeBox, i18n("The field is empty"));
+	QToolTip::add(homeBox, tr("The field is empty"));
 	break;
     case 2:
 	homeBoxColour = red;
-	QToolTip::add(homeBox, i18n("Invalid Path!"));
+	QToolTip::add(homeBox, tr("Invalid Path!"));
 	break;
     case 3:
-	QToolTip::add(homeBox, i18n("Directory does not exist, but will be made"));
+	QToolTip::add(homeBox, tr("Directory does not exist, but will be made"));
 	break;
     case 4:
 	homeBoxColour = orange;
-	QToolTip::add(homeBox, i18n("Placing home directory outside '/home/' can cause compatibility problems with some programs.\n\nNOT RECOMMENDED"));
+	QToolTip::add(homeBox, tr("Placing home directory outside '/home/' can cause compatibility problems with some programs.\n\nNOT RECOMMENDED"));
 	break;
     case 5:
 	homeBoxColour = red;
-	QToolTip::add(homeBox, i18n("Requested path is a file (not a directory!)"));
+	QToolTip::add(homeBox, tr("Requested path is a file (not a directory!)"));
 	break;
     }
     
@@ -196,8 +196,8 @@
     //Validate all data fields, prompt with errors or create the new user as requested
     bool inputError = false;
     bool warnError = false;
-    QString inputText = i18n("The following errors occured whilst trying to add a new user:\n");
-    QString warnText = i18n("The following non-critical errors occured whilst trying to add a new user, do you wish to continue?\n");
+    QString inputText = tr("The following errors occured whilst trying to add a new user:\n");
+    QString warnText = tr("The following non-critical errors occured whilst trying to add a new user, do you wish to continue?\n");
     
     //Username validation
     QString username = usernameBox->text();
@@ -206,15 +206,15 @@
     switch (usernameError)
     {
     case 1:
-	inputText += i18n("\n- The 'Username' field has not been filled in.");
+	inputText += tr("\n- The 'Username' field has not been filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- The 'Username' field may only contain letters and numbers (not spaces).");
+	inputText += tr("\n- The 'Username' field may only contain letters and numbers (not spaces).");
 	break;
     case 3:
 	inputError = true;
-	inputText += i18n("\n- The username you have chosen is already in use, please choose another.");
+	inputText += tr("\n- The username you have chosen is already in use, please choose another.");
 	break;
     }
     
@@ -225,11 +225,11 @@
     {
     case 1:
 	inputError = true;
-	inputText += i18n("\n- The 'Full Name' field has not been filled in.");
+	inputText += tr("\n- The 'Full Name' field has not been filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- The 'Full Name' field may not contain ! @ or :");
+	inputText += tr("\n- The 'Full Name' field may not contain ! @ or :");
 	break;
     }
     
@@ -241,19 +241,19 @@
     {
     case 1:
 	inputError = true;
-	inputText += i18n("\n- The 'Home Directory' field has not been filled in.");
+	inputText += tr("\n- The 'Home Directory' field has not been filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- The value entered as 'Home Directory' is not a valid path.");
+	inputText += tr("\n- The value entered as 'Home Directory' is not a valid path.");
 	break;
     case 4:
 	warnError = true;
-	warnText += i18n("\n- Placing home directory outside '/home/' can cause compatibility problems with some programs and is NOT RECOMMENDED.");
+	warnText += tr("\n- Placing home directory outside '/home/' can cause compatibility problems with some programs and is NOT RECOMMENDED.");
 	break;
     case 5:
 	inputError = true;
-	inputText += i18n("\n- A file was selected as 'Home Directory', this value must be a directory.");
+	inputText += tr("\n- A file was selected as 'Home Directory', this value must be a directory.");
 	break;
     }
     
@@ -271,15 +271,15 @@
 	break;
     case 1:
 	inputError = true;
-	inputText += i18n("\n- Both password fields must be filled in.");
+	inputText += tr("\n- Both password fields must be filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- Passwords don't match, please try again.");
+	inputText += tr("\n- Passwords don't match, please try again.");
 	break;
     case 3:
 	inputError = true;
-	inputText += i18n("\n- Invalid password");
+	inputText += tr("\n- Invalid password");
 	break;
     }
     
@@ -288,7 +288,7 @@
    if (inputError)
    {
        //Throw up the error box!
-       KMessageBox::error(this, inputText, i18n("Error!"));
+       KMessageBox::error(this, inputText, tr("Error!"));
    }
    else
    {
@@ -296,7 +296,7 @@
        int abortAdd = 0;
        if (warnError)
        {
-	   abortAdd = KMessageBox::warningYesNo(this, warnText, i18n("Warning!"), i18n("&Yes"), i18n("&No"));
+	   abortAdd = KMessageBox::warningYesNo(this, warnText, tr("Warning!"), tr("&Yes"), tr("&No"));
        }
        //Check we didn't abort the operation
        if (abortAdd == 0)

Modified: pcbsd/trunk/pcbsdusermanager/changepasscode.cpp
===================================================================
--- pcbsd/trunk/pcbsdusermanager/changepasscode.cpp	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/changepasscode.cpp	2007-03-15 21:56:22 UTC (rev 141)
@@ -39,7 +39,7 @@
     white = QColor(255, 255, 255);
     red = QColor(255, 78, 78);
     
-    setCaption(i18n("Change Password for '") + username + i18n("'"));
+    setCaption(tr("Change Password for '") + username + tr("'"));
     
     connect(okButton, SIGNAL(clicked()), this, SLOT(commit()));
     connect(passBox, SIGNAL(textChanged(const QString&)), this, SLOT(passwordChanged()));
@@ -57,13 +57,13 @@
             close();
             break;
         case 1:
-            KMessageBox::error(this, i18n("You must specify a password"), i18n("Error changing password..."));
+            KMessageBox::error(this, tr("You must specify a password"), tr("Error changing password..."));
             break;
         case 2:
-            KMessageBox::error(this, i18n("The passwords didn't match. Both boxes most contain the same value."), i18n("Error changing password..."));
+            KMessageBox::error(this, tr("The passwords didn't match. Both boxes most contain the same value."), tr("Error changing password..."));
             break;
         case 3:
-            KMessageBox::error(this, i18n("Invalid password, please choose another."), i18n("Error changing password..."));
+            KMessageBox::error(this, tr("Invalid password, please choose another."), tr("Error changing password..."));
             break;
     }
 }
@@ -73,7 +73,7 @@
     int passError = back->validatePassword(passBox->text(), confirmPassBox->text());
     
     QColor passBoxColour = white;
-    QToolTip::add(passBox, i18n("Passwords match"));
+    QToolTip::add(passBox, tr("Passwords match"));
     
     switch (passError)
     {
@@ -82,11 +82,11 @@
 	break;
     case 2:
         passBoxColour = red;
-	QToolTip::add(passBox, i18n("Passwords do not match"));
+	QToolTip::add(passBox, tr("Passwords do not match"));
 	break;
     case 3:
         passBoxColour = red;
-        QToolTip::add(passBox, i18n("Invalid input"));
+        QToolTip::add(passBox, tr("Invalid input"));
     }
     
     passBox->setPaletteBackgroundColor(passBoxColour);

Modified: pcbsd/trunk/pcbsdusermanager/mainDlg.ui
===================================================================
--- pcbsd/trunk/pcbsdusermanager/mainDlg.ui	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/mainDlg.ui	2007-03-15 21:56:22 UTC (rev 141)
@@ -655,10 +655,10 @@
         <data format="PNG" length="1493">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000059c49444154388d85555b6c5cd5155dfbde73ef9df15ccf78c6891ddb33e389e36062136a5b7120a428b4b821343ca20002fa0141a520b514be1029e1a3a86a3faa7e345544fb81442bf8286a51694a69235a2a2b4a629c8763a7b6b18d3dcef8319ef13c7d67eedcf7e12375204a6997b43eb674f63a5b6b9fbd0f1d7fda8f2f8308ccb0e8c74195bf140c88724324b2a648fc1db39afd45cde03980ae9ff5c91c820080e32608013fc706d53a8ee630dfcfb9772c9b77d46cc1917345bbcd5512afccae6e1b05b8f2850addacf625880ff433700e700e2c64e3834cd47f9d686f0a3b523b5656b2b02d071e04c43ada8253b3bc2d14a43f7be403132d30d103d17fbf40d074011b14056b53a9ec366ee9b80bcf1f3d81bebd8791cd3b48ce2d23bd92872849b7eb6e03885b606403fcabab66baf945603afe6588fe5230d211647e86478fbc80d8d62e0c0f7d88cc6a06c4ada45b33a0d457c021fc6f2b76b610f49a87aa41308c5c8a58b867d7ae3bfa1beb05906d21b6bd1b7bbe710033e317968a99c9e79ac25e56966880088302214c840c00e7a68a45350e0287e29560da1e4810df98bc32f5ec2ded0d802b02b53ce093c03!
 d7fb939224e3011afd936bd2a32ee771dc79065362610becb39266e10beedb1b740dc865f1bc3b6fa35445869f1f24c76d936dc36c9d3009b60eb3ea4d3b9e9b042fb0c8b7ec24440703c6c6ad9eaab1416ee60a2789c038337348f3c039e6b6355ecc62cf6e233af2f77676fecd0d9731735d316a15509ef9dfcfb990635f70891f8ad4acd41b96c6253b417f71c7907f1be276018d65ed7c5bdae4bd820db788f3259a8b88a3abd18de3a4eb7efab550469edd224ea022a46f5efc4b6f5071fc5c48b77b546245836d0b3fb30a470145d5fff3e5293433ebdbc7cbf20caffbc6e051148148558a5621c2d164b77e6b2464740f5871e3ed40f55dd873abf84c3bd4e7c64f8b33fd4c941f4ee3980b6e62850d708ac4d430dc521fb1b619496ba1c874422b8d79a2750ebba66fe7c6aa6f4b865027b763723145251c89760d92eb4b207857174c50a387d6a1ab95dfb108dfb003d0f1043adb0846ab900cb15638e8746226401808d4d14b627e78b079f7da21b0208695b40c0c710aaf741cdcec36bdc8cf1737f42f2fc7b30aa2e16af2ea0b7fb36c036806a06e9b9692ca5cb2048a4fa0051bc662d2be5f5c8ee5046b58efd14048ecdcf1c85b4673f827f7b13dac5d3c82a61b43c348814f3c02419e7ce0ca1339e4057a21d139393f8d7d93328150d24b6d0a95449cee6d76!
 d103c882f9ba9bef8e8478fece86b40b4a71553ef7f8096c509e83363d8f1f!
 811c4c30
1a486ce23facd87f0e9d465988e8044bc09b1580bd4a6182e7d9ac2d0bf73bf4de6d9b1e174ab79f26c0623732e58f3cece93e2b4be1c8cfadafcad846f1f4c60e8f438ee3e782f446b0d9e483c3533c5cf589e9037b7a35eadc7a2a6803586e064345c5c6458653b0f9a7a6d805cf3a42c4b272ccb4a8b875efba5056dfd4debdd0ffb439ba9d31f02ba5aeb2107ebe01634fce68db7afbc3ebf1c5cca1724c7e1286a26c831f1e0e0ad584866f1a35f7d005d2b07cc9ad664d4f4bb05418813519e29af7c0fd0caeb9a8ea3735752f70d287e40510129822b232bd58f570acb3ad053cbe7a06beb2051c16c5d33502c63e472128542f1861d41448f11d116c6af2e284468977bc4d181fd51201a05023ea052c3c0839d81178adafdb94f92f3639e77c9300c0930b0b402e4568bf8c7c8ec86d8f54906e071cec799bf5e38d09aa0f76fbd2f027476a09ce5d6c21fe7ab5d4f76877dac8a434ff680d634f9f5f9dc0f47815500e43a0e3cd745cdb0bf6a6b7241ab78c37f9dc3b0e64550c939387ffcc2ef663f4e7eedc2894b1f59c57564c7a731b958bcfc2a9051fe930410271027227e2dbe89609c2393d0dd7bde7debea5f4af6fca644c5fe8102d8ab63e9a77effb3c2a94ac51edb617b4fd9f87fbfdc8df81ce19b9d9b9c49a1f60000000049454e44ae426082</data>
     </image>
     <image name="image5">
-        <data format="PNG" length="930">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000036949444154388db5955d689b5518c77f27c9bbae695a564dd2b9b5c3e8ac1f5344d66cab88e257457020ee42bc53bca878215ef462ea855e08456503511165936dc2c480ba6168d38ec96668bbaeeadcd2ea68daad8d0d69d6666dd3347ddfbcc9fb78f166aeb6ecc3e1fef0c0e170f89de7f93f0fe72811e166c8b17c43a9d6c7eb5f445715ddfb950ade7fc36411f957e00c7dd63729b2e784c83daf8bc12d7d217821b8fcdcb562e5c603f1e8cf29918eb848e779919d9d22ebde109dbae81e68d974bd60b5d463a5eaeb1e7c7b62f4bd56aa5219300c500ac401835310eec148ff103bc49fedbb450e9ebc9a13cbc02f3ff6fcb7fb8eb56c8681332625137c5e0db36877c37242621e7afea094399ce8e044dbbb22a153d706afedfee8b51f5bdafc6b20b700ba0ee3a326c502d4f8344ca00408903661e0343a91f8f7f4bfb35b24f4eb95c1db73036f7ee269d28bb60d4601f43ce80b7061ccc43461b54fc35a0df9220c0d030a2862d2732142e75bed227bfb60c9b829d5e875377b1a1735981198016615ccae826c25d0a0617935d20993541286ce01ab000da844e325fff6759d7b7bd5c3fd1f02b8fe49577bf5e9c0166a!
 2e9660be04868009e880a9c0a88042354cd56a2c9cc5be3900773c024d0d705b054c2cc277cf6c7d56a9daf72f83373ddaec5e0f19813c60281b6c020670b100d9793b95c07310bc1bfc0a523af476c08407a8024c1488ba0c7eb2799ba30ae6040c17e80279815c018a16d456c3b6006cae859405a7a621d40d8c0369c0096c05a611c8592edbdfdb7deae0d8bd3917cc1660b168f7646d0d04d74383dbae2296840f7e032b53f6a81ab813f0008308ed03c34c7e7c004a793be3ca5782b201cf59818d95b0a50e3656c09c05b16938320af9b9320cc0575e8f00e1c9318eef3b86f54504c67a81a488582ea594d3b963b4f58987e03eb7dde4980907a6209d2d1bec2cc30a401238c21c873a4e72eef30884bb811111b9742de5a9b8cb2ff5de0d2e371c1618cf829865d8ade55369a08b3ca1fedfe9fbb20bbe3a0ac44424cb95d5d4e8d869c42fbd1e0e11718a08ba085d22ec383f086dbbc0f914e0bdde47c805b8f0e3ac2a576ac681fd85245f7f1325f169047e89020911295e25bb1572c15f331c1d1a59c80434c2bd6738bd2b0c3f4581611129fc17d85229114129b506f002691199bf51d80af0cdd08a3fefffd2dfd6cc065a83340fcd0000000049454e44ae426082</data>
+        <data format="PNG" length="1252">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000004ab49444154388d8d9549889d5516c77f77f8eef7def7a6aaf7f22aafaa624a6355a2b1123bd1248543178a2348362e84800a069c16824bd18d908de046105cb442a085564171a0171d876e1b89c6a1520e319626161593d490d4f4c66fbe2e42624252d1ffeac2e1fc3887fb3fe708fe4c861e3caa14e9c562a9334d8739424e5f2e4dac18c9b1ce1dd60f57aeeeda515a555893ef2e94011a0b8df9a5b9fab1f9a34bfba31f93d76933f5d7c02586bb6ef3f66c1bdd72cfdf86ae77cb5e371995c1911a2d0db18df1139fe9e569c626c63b5f7f72f09dc6ff83e769f1cb8a6039c8835b1ebae6e5bbb7df59ecf56a4821d9ba6684d5853e7e9c1de7f0ec411c95412090681082a9c631f67dfed1c2f7ff3cf2a89de2edb32c75eeb191c76f7e62f36b3b6fbccf2d688f66b8c4e6bead8c0ede4bb757617df53aac88995c3c04a4c484447140d129b0616028dbec5fbcffe4cfa77f6099c3e7c0a2c2b61b1e1f7cebaecd77688d251501291d867aae636dd7fa731daded1a2467721c591c23b5318894300d10295cd1b346ce57a6ef3b35de788f80530a10b59df9bd77dd71ebfabcce6245805209a9f019e85ecf40d735177c41ad3!
 040d9eb6172f92061d2066189d3108da27b55d14c2d4dd5da13f15b529418deb0bd7fb46472443440fa58e983ec808c2e69986babdb7860d3d3e43286c82e81f4096d9372b6c4e048efbd78ac93d97e7973adb7dbb104207c903e42f908ed2364724930405f61905d9b9fa1922f1351c7ca0ed8905a5f39ebf6899ba4d7ad7b9509896d13a122840a10ca47e90e62858acfaaeaad65d7a667c9673258e113da06ca846472aa471b47e9a5f038369da75aacd06d8ab8ca800a516ae58acfaa686a584216c25f39dd58a61105384aa1b1907124489f667202a259226d302a2111cdcb4293049e7a7f3741f6bf24a9416970adc25ad0916f232520e32ab246e01a81e344a0eb58b9323849e1b98f1fc3adbe8b479e561bac4d89624b9a6065b0949e883b968c0bc601d70832aec4cb688cd697844669c09ecf7693eb7f9355c522464b1c0d195710b652c2463223dbbf45fbe72623df3802c7111847600c649d2c8ec85f048dadcf8b5f3d49efc0175472158c1618078c39937b6a32ae774e260764dcb63fcd7c17fe6f613ea594d7689de26881ab4a28e15d004d6dc43fc65f60e3409b2e73158ef4d0daa2b5a5e04966661266c783ffa4819d5480edcc2453f90d7a97eb7a7a5d7f05c749c8c83249e452736fc45519827499d7bf7f95e10181109ac47608d23ac890acea62e248c!
 8e4a156e3e7379abb93d04e2b80b8638ff97349bbb091bb5b6dc3d5e5eb595!
 d588b542
9effef021dfcc7ecae15313fc7d68084b72c6f3c2e239253acb45be3c34cd89e3cbf1c157ea8fb6e7927d70de766bcd255f2cff1a2f9637c5a3d3fe8c13b573f46687191918616bef085b6adbc9ea320a834d0c8b0d9fb1a3138c1dff96c593cdfa8197ea4f2d4ec67bcff22e5af4d992bc6dc72385e7876e776ec995b5c8a92a5d4e0dcf14b0d6d20aeb2c45d3b492799aa793e4f0bfc37d63ff6aee099ae9fef3392b9da66cbeaa46afda9ed9b966abded1b3415d6972360782a04963e65072f4e4b7d181c903fe07ad85f453e0a2d95ff9e6fda1225055ce198b24916d0173c065c7f2772e28ef197db838810000000049454e44ae426082</data>
     </image>
     <image name="image6">
-        <data format="PNG" length="945">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000037849444154388dadd55b6816641cc7f1cf7bde5eb7b939a7cea59b87b486739e576bcccd53a91989685416541044e14d14988544d8655711dd184517792176918129a5d4953ab0b444114b3cb0cd96faba39b777eff674f12e594a1ec22f3c377f1ebefcff7f7e0f4f0434ff4c533d9791c5350c62000777d3de46ac143122a3a87e86ee1e7a232bf49f186f60f1976e227a73e1f60c11720c057256ab496f2d6f7cf84dd2a9ff2f1eeccf4f91aa5e6752e14fcbdf18bffbc0d7458d5b3657d4d3547bf3f5f89d85596419bde829758d9b9b56963eb2b185aab174672919032db3d97be4eec58318fbd073e6b56e9ab7b4ac61691d95c56406e8eda4b080a2222c58b741db3b5fdc5e1c864fd45ae3bc37a3b5766ec3744a93f40c72e60a8904e7bba89b8e1865f5331a2eb7951570b9ef1f4df41661d24665dac6ccb3ab7585b933a7726580737d74f5f1cb058e765031994b11ba50d7a49cc767dfda712e1715b55699ad12ea0c9289d31da337472ccb954e1205544f2199269320996020c2e45a54ae5faf7dc7a111e2e2c268ebfc3d350b35ff7e06fdf9eae0106da7495f624c3915d5248bc8a448c6b91ea500d773c44b51377f!
 81f67f755c37b1608ee6971752d2c4991e8efcc1fe6f90a1b78a924a7ad364136423240309f40792431427285e523da77beff8d1746686c557426f46eeddfde2ae31ad878d8dac7c858e01b61fa3234b470fe3e394201121990fa124865051afb4db6333d97568587c35eba2b86e9ce2749af72fa0861716f3d6324625f82dc3b767e9cce557518474846424fff20b2761d64b4ff8352f8e71f59aefbb73feaca9513db6cc544c448aa3edfc7096035dcc9ec8aa292cafc9eff7528e4be88932182792a2ab6372a143dbb643644442aa686e31f6d5a72d5bd7a4b16082eae1dc0c0d07b38071e56c98c2b4220602dffdc589defcda06f7e9f27ac554baba478a47f220ab9798f3f67a4f36376856a46244de23f9e55616f36c1593a3a4f063275fad39bcc5e1451ffe87f70685a41ba4b67c60cdf1c33e0bfd4e86106b0f21762104e743702184d4c5106afb4368e90f41cbb1cf193dea4ee2918ca66aa9711f7fe2b5ce530e8690e80ba1208490ca8510cf85a02f04cb8eef6042f9bd8847f200ab9e376be70edbae9f8f9e0d211d42280921587d722755157756dc9e28a6f1e2268feedbe3a3cc3973f67f9a9feefe91c6149421160921dc4ff90deef1cfbb7bfe061c4a335939bfafa50000000049454e44ae426082</data>
+        <data format="PNG" length="1230">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000049549444154388d8dd44b685c551cc7f1ef39e73e67f2984c9236efb4e9c326ada6c6a2625ba9a05514375a5f0b415150447021e246d0ae14dcb81111d48d8f850b51041722f808da56ac7d185b9abecce4dde92499cce4de3b73ef3dc74555ac7dd8fffeffe19cffffc75f70f552f874d14c0f1edd8021629a25a6889801f4951ac515c936b6350efb4fb70de487db3af2ddb9a65c1e60b1bcb4707eb63479feece2d1ea91f03d4a1cbc36b89d9d9df7e6dfbcf9b6915b460646c8fb796c61a3a4224e63121d53d775966b550e9d3dc481d15fbe3bf775f9158afc78f157ff55d656f1d28ee7473e7974f79e9ecd1d43b8ca42eb98c44404f52536b46d62e7c09df4e5d6520e8bf4e57bd9b265684dba317a72666ebeaae7d97709ecdeaa5ebfeb995bf7ee1eba131b416c021031861a29213b06eee18ef5f793f3f3ac6aec4449189bfb195ff96cecd820c4ba6477617646eb59f3c33fb01ae0915dcfddf8d6ce81eda4a6861175a44ad14448a5b977f0716eecda71d1c4aa7199dfe7f7a14949744c6fae97b8a772c7d4f1e231b3c43189c05d7377ebabc3fd9b497480162142d6885922ebb93c3afc0283eddb2e5985210615818!
 cd084a42664dbc056faee6e790d702cab935d1b86bb073da94859414a41cd847436f6f1d0d04bb4f81d974f8d48112a04ad3112126df094c5861bba870a1d0bb75bd91efba6d5ed2da44428999010b3bef57a1e187c91ac9dbb3c0a08a1112a026110c66052d0c662557b8e6c8f7593e567556ba4cf13a53619cba6c9cff1f0e6977155c315d10b708ab4428c364823104a13d442427d1eafc16ab52c25097491a96a8916b268d54ea9ba4057f3ffc052a3ec885a3da29a0694c2320bd56522c0564248b4119ea5f01c012a60d98cf3c6e8e34c2d15ae0aa70454f4292ae91956f4344656715d89674b4c8a90f5d04412705d816b4b9afc2cb9ae31de3efc18b3d5935779718aedc6789ec4772d3c47e13a0205c4a10965584cc783b2c677058e0d8e0d8d7e239d7d67f8e0f727990e0e5d16b6a422e32a3c075c4760dbe07b9260491316d31372a5907c3b77b2be280478aec0b6c0b10d19ab8d815e8fcf4eee65ae7629aea487677bd836d8d6855e2560763c2e0593c9f752d7cdc4ec4fd1c785c904dff2f13c89920247369191ab18ec5ecb37a73f6431be782ce5a88825322865f03d892b1dcefe1133b72ffc48c766520154a79323d91eebbe24abda7a5bba696b6ec296195c99276b75d0975bcfd1e93126cba799583cc96ff3a39c33df20ad10dfce122c3770f8c412130!
 7567e3bf5c5cab318aa0ac0682ac5a3f5d1862e6e0fb2c12a11aea6bf7998d!
 5d975343
95d34585df4e7aea3b9c1427ab33899128d6e33f5a089a3e345c6a62728ecaf1e39f46e658f4e98807f5d379d303fb5bff6956db3d65957daf447659c7225a45e530893c1168da48964a1ba4861a1c091e983fc32334aa932cff1cf82cf0fbe5f7942a79cf927359759b893ebb11e1cd9937d6acd76eb16bf4d3738bec4b2241848d2947a60084bb27a663439f0eba7d57796e7d22f81fa4571bc6250c11192cdadfdf648c7267bc86b92398068592fce1cab8f2d1692c3c670ecbfe0b5c07f5716c80b49e6af7d04400908aed6f427bde1ebf1aeaef0f40000000049454e44ae426082</data>
     </image>
 </images>
 <tabstops>

Modified: pcbsd/trunk/pcbsdusermanager/maindlgcode.cpp
===================================================================
--- pcbsd/trunk/pcbsdusermanager/maindlgcode.cpp	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/maindlgcode.cpp	2007-03-15 21:56:22 UTC (rev 141)
@@ -120,11 +120,11 @@
 {
     systemChange = true;
     
-    qDebug("Fetching details for user: " + username);
+    qDebug("Fetching details for user: %s", username.ascii());
     User *user = back->getUser(username);
     
     QString uid = QString::number(user->getUid());
-    if (uid == "-1") { uid = i18n("New User"); }
+    if (uid == "-1") { uid = tr("New User"); }
     uidBox->setText(uid);
     fullnameBox->setText(user->getFullname());
     homeBox->setText(user->getHome());
@@ -141,7 +141,7 @@
 
 void mainDlgCode::getGroupDetails(const QString &groupname)
 {
-    qDebug("Fetching details for group: " + groupname);
+    qDebug("Fetching details for group: %s", groupname.ascii());
     QStringList users = back->getAllUsers(-1, -1);
     users.sort();
     Group *group = back->getGroup(groupname);
@@ -216,17 +216,17 @@
         switch(valid)
         {
             case 1:
-                KMessageBox::error(this, i18n("You must specify a name for your group"), i18n("Error adding group..."));
+                KMessageBox::error(this, tr("You must specify a name for your group"), tr("Error adding group..."));
                 break;
             case 2:
-                KMessageBox::error(this, i18n("Invalid group name specified. Group names may contain only letters and number. Spaces are NOT permitted"), i18n("Error adding group..."));
+                KMessageBox::error(this, tr("Invalid group name specified. Group names may contain only letters and number. Spaces are NOT permitted"), tr("Error adding group..."));
                 break;
             case 3:
-                KMessageBox::error(this, i18n("The group '") + group + i18n("' already exists, please choose a different name"), i18n("Error adding group..."));
+                KMessageBox::error(this, tr("The group '") + group + tr("' already exists, please choose a different name"), tr("Error adding group..."));
                 break;
         }
         
-        group = KInputDialog::getText(i18n("New Group"), i18n("Please enter a name for your new group"), group, 0, this);
+        group = KInputDialog::getText(tr("New Group"), tr("Please enter a name for your new group"), group, 0, this);
         if (group == QString::null) { return; }
         valid = back->validateGroupname(group);
     }
@@ -246,27 +246,27 @@
     int homeError = back->validateHome(homeBox->text());
     
     QColor homeBoxColour = white;
-    QToolTip::add(homeBox, i18n("Directory will be used"));
+    QToolTip::add(homeBox, tr("Directory will be used"));
     
     switch (homeError)
     {
     case 1:
-	QToolTip::add(homeBox, i18n("The field is empty"));
+	QToolTip::add(homeBox, tr("The field is empty"));
 	break;
     case 2:
 	homeBoxColour = red;
-	QToolTip::add(homeBox, i18n("Invalid Path!"));
+	QToolTip::add(homeBox, tr("Invalid Path!"));
 	break;
     case 3:
-	QToolTip::add(homeBox, i18n("Directory does not exist, but will be made"));
+	QToolTip::add(homeBox, tr("Directory does not exist, but will be made"));
 	break;
     case 4:
 	homeBoxColour = orange;
-	QToolTip::add(homeBox, i18n("Placing home directory outside '/home/' can cause compatibility problems with some programs.\n\nNOT RECOMMENDED"));
+	QToolTip::add(homeBox, tr("Placing home directory outside '/home/' can cause compatibility problems with some programs.\n\nNOT RECOMMENDED"));
 	break;
     case 5:
 	homeBoxColour = red;
-	QToolTip::add(homeBox, i18n("Requested path is a file (not a directory!)"));
+	QToolTip::add(homeBox, tr("Requested path is a file (not a directory!)"));
 	break;
     }
     
@@ -287,16 +287,16 @@
     int fullnameError = back->validateFullname(fullnameBox->text());
     
     QColor fullnameBoxColour = white;
-    QToolTip::add(fullnameBox, i18n("Good Input"));
+    QToolTip::add(fullnameBox, tr("Good Input"));
     
     switch(fullnameError)
     {
     case 1:
-	QToolTip::add(fullnameBox, i18n("The field is empty"));
+	QToolTip::add(fullnameBox, tr("The field is empty"));
 	break;
     case 2:
 	fullnameBoxColour = red;
-	QToolTip::add(fullnameBox, i18n("This field may not contain ! @ or :"));
+	QToolTip::add(fullnameBox, tr("This field may not contain ! @ or :"));
 	break;
     }
     

Modified: pcbsd/trunk/pcbsdusermanager/simpleaddcode.cpp
===================================================================
--- pcbsd/trunk/pcbsdusermanager/simpleaddcode.cpp	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/simpleaddcode.cpp	2007-03-15 21:56:22 UTC (rev 141)
@@ -53,20 +53,20 @@
     int usernameError = back->validateUsername(username);
     
     QColor usernameBoxColour = white;
-    QToolTip::add(usernameBox, i18n("Good Input"));
+    QToolTip::add(usernameBox, tr("Good Input"));
     
     switch (usernameError) 
     {
     case 1:
-	QToolTip::add(usernameBox, i18n("The field is empty"));
+	QToolTip::add(usernameBox, tr("The field is empty"));
 	break;
     case 2:
 	usernameBoxColour = red;
-	QToolTip::add(usernameBox, i18n("This field can only accept letters and numbers"));
+	QToolTip::add(usernameBox, tr("This field can only accept letters and numbers"));
 	break;
     case 3:
 	usernameBoxColour = red;
-	QToolTip::add(usernameBox, i18n("This username is already in use, please choose another."));
+	QToolTip::add(usernameBox, tr("This username is already in use, please choose another."));
     }
     
     usernameBox->setPaletteBackgroundColor(usernameBoxColour);
@@ -77,7 +77,7 @@
     int passError = back->validatePassword(passBox->text(), confirmPassBox->text());
     
     QColor passBoxColour = white;
-    QToolTip::add(passBox, i18n("Passwords match"));
+    QToolTip::add(passBox, tr("Passwords match"));
     
     switch (passError)
     {
@@ -86,11 +86,11 @@
 	break;
     case 2:
         passBoxColour = red;
-	QToolTip::add(passBox, i18n("Passwords do not match"));
+	QToolTip::add(passBox, tr("Passwords do not match"));
 	break;
     case 3:
         passBoxColour = red;
-        QToolTip::add(passBox, i18n("Invalid input"));
+        QToolTip::add(passBox, tr("Invalid input"));
     }
     
     passBox->setPaletteBackgroundColor(passBoxColour);
@@ -101,16 +101,16 @@
     int fullnameError = back->validateFullname(fullnameBox->text());
     
     QColor fullnameBoxColour = white;
-    QToolTip::add(fullnameBox, i18n("Good Input"));
+    QToolTip::add(fullnameBox, tr("Good Input"));
     
     switch(fullnameError)
     {
     case 1:
-	QToolTip::add(fullnameBox, i18n("The field is empty"));
+	QToolTip::add(fullnameBox, tr("The field is empty"));
 	break;
     case 2:
 	fullnameBoxColour = red;
-	QToolTip::add(fullnameBox, i18n("This field may not contain ! @ or :"));
+	QToolTip::add(fullnameBox, tr("This field may not contain ! @ or :"));
 	break;
     }
     
@@ -122,8 +122,8 @@
     //Validate all data fields, prompt with errors or create the new user as requested
     bool inputError = false;
     bool warnError = false;
-    QString inputText = i18n("The following errors occured whilst trying to add a new user:\n");
-    QString warnText = i18n("The following non-critical errors occured whilst trying to add a new user, do you wish to continue?\n");
+    QString inputText = tr("The following errors occured whilst trying to add a new user:\n");
+    QString warnText = tr("The following non-critical errors occured whilst trying to add a new user, do you wish to continue?\n");
     
     //Username validation
     QString username = usernameBox->text();
@@ -132,15 +132,15 @@
     switch (usernameError)
     {
     case 1:
-	inputText += i18n("\n- The 'Username' field has not been filled in.");
+	inputText += tr("\n- The 'Username' field has not been filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- The 'Username' field may only contain letters and numbers (not spaces).");
+	inputText += tr("\n- The 'Username' field may only contain letters and numbers (not spaces).");
 	break;
     case 3:
 	inputError = true;
-	inputText += i18n("\n- The username you have chosen is already in use, please choose another.");
+	inputText += tr("\n- The username you have chosen is already in use, please choose another.");
 	break;
     }
     
@@ -151,11 +151,11 @@
     {
     case 1:
 	inputError = true;
-	inputText += i18n("\n- The 'Full Name' field has not been filled in.");
+	inputText += tr("\n- The 'Full Name' field has not been filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- The 'Full Name' field may not contain ! @ or :");
+	inputText += tr("\n- The 'Full Name' field may not contain ! @ or :");
 	break;
     }
     
@@ -173,15 +173,15 @@
 	break;
     case 1:
 	inputError = true;
-	inputText += i18n("\n- Both password fields must be filled in.");
+	inputText += tr("\n- Both password fields must be filled in.");
 	break;
     case 2:
 	inputError = true;
-	inputText += i18n("\n- Passwords don't match, please try again.");
+	inputText += tr("\n- Passwords don't match, please try again.");
 	break;
     case 3:
 	inputError = true;
-	inputText += i18n("\n- Invalid password");
+	inputText += tr("\n- Invalid password");
 	break;
     }
     
@@ -190,7 +190,7 @@
    if (inputError)
    {
        //Throw up the error box!
-       KMessageBox::error(this, inputText, i18n("Error!"));
+       KMessageBox::error(this, inputText, tr("Error!"));
    }
    else
    {
@@ -198,7 +198,7 @@
        int abortAdd = 0;
        if (warnError)
        {
-	   abortAdd = KMessageBox::warningYesNo(this, warnText, i18n("Warning!"), i18n("&Yes"), i18n("&No"));
+	   abortAdd = KMessageBox::warningYesNo(this, warnText, tr("Warning!"), tr("&Yes"), tr("&No"));
        }
        //Check we didn't abort the operation
        if (abortAdd == 0)

Modified: pcbsd/trunk/pcbsdusermanager/simpledlgcode.cpp
===================================================================
--- pcbsd/trunk/pcbsdusermanager/simpledlgcode.cpp	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/simpledlgcode.cpp	2007-03-15 21:56:22 UTC (rev 141)
@@ -91,16 +91,16 @@
     int fullnameError = back->validateFullname(fullnameBox->text());
     
     QColor fullnameBoxColour = white;
-    QToolTip::add(fullnameBox, i18n("Good Input"));
+    QToolTip::add(fullnameBox, tr("Good Input"));
     
     switch(fullnameError)
     {
     case 1:
-	QToolTip::add(fullnameBox, i18n("The field is empty"));
+	QToolTip::add(fullnameBox, tr("The field is empty"));
 	break;
     case 2:
 	fullnameBoxColour = red;
-	QToolTip::add(fullnameBox, i18n("This field may not contain ! @ or :"));
+	QToolTip::add(fullnameBox, tr("This field may not contain ! @ or :"));
 	break;
     }
     

Modified: pcbsd/trunk/pcbsdusermanager/usermanagerback.cpp
===================================================================
--- pcbsd/trunk/pcbsdusermanager/usermanagerback.cpp	2007-03-15 16:59:06 UTC (rev 140)
+++ pcbsd/trunk/pcbsdusermanager/usermanagerback.cpp	2007-03-15 21:56:22 UTC (rev 141)
@@ -28,7 +28,7 @@
     fullnameRegExp.setPattern("([:!@])+");
     homeLocRegExp.setPattern("^(/usr)?/home/?");
     usernameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+");
-    passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"£$%^&*()_+=¬#'`@~:?<>|{}\-.]*)+");
+    passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"£$%^&*()_+=¬#'`@~:?<>|{}\\-.]*)+");
     groupnameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+");
 }
 
@@ -324,7 +324,7 @@
         {
             case 1:
                 //Modify Group
-                qDebug("Modifying group '" + groupIt.data().getGroupname() + "'");
+                qDebug("Modifying group '%s'", groupIt.data().getGroupname().ascii());
                 pw->addArgument("pw");
                 pw->addArgument("groupmod");
                 pw->addArgument(groupIt.data().getGroupname());
@@ -335,7 +335,7 @@
                 break;
             case 2:
                 //Add Group
-                qDebug("Adding group '" + groupIt.data().getGroupname() + "'");
+                qDebug("Adding group '%s'", groupIt.data().getGroupname().ascii());
                 pw->addArgument("pw");
                 pw->addArgument("groupadd");
                 pw->addArgument(groupIt.data().getGroupname());
@@ -346,7 +346,7 @@
                 break;
             case 3:
                 //Delete Group
-                qDebug("Deleting group '" + groupIt.data().getGroupname() + "'");
+                qDebug("Deleting group '%s'", groupIt.data().getGroupname().ascii());
                 pw->addArgument("pw");
                 pw->addArgument("groupdel");
                 pw->addArgument(groupIt.data().getGroupname());
@@ -368,7 +368,7 @@
         {
             case 1:
                 //Modify User
-                qDebug("Modifying user '" + userIt.data().getUsername() + "'");
+                qDebug("Modifying user '%s'", userIt.data().getUsername().ascii());
                 pw->addArgument("pw");
                 pw->addArgument("usermod");
                 pw->addArgument(userIt.data().getUsername());
@@ -394,7 +394,7 @@
                 break;
             case 2:
                 //Add User
-                qDebug("Adding user '" + userIt.data().getUsername() + "'");
+                qDebug("Adding user '%s'", userIt.data().getUsername().ascii());
                 pw->addArgument("pw");
                 pw->addArgument("useradd");
                 pw->addArgument(userIt.data().getUsername());
@@ -423,7 +423,7 @@
                 break;
             case 3:
                 //Delete User
-                qDebug("Deleting user '" + userIt.data().getUsername() + "'");
+                qDebug("Deleting user '%s'", userIt.data().getUsername().ascii());
                 pw->addArgument("pw");
                 pw->addArgument("userdel");
                 pw->addArgument(userIt.data().getUsername());
@@ -438,5 +438,5 @@
     
     return true;
 }
-
-#include "usermanagerback.moc"
+
+#include "usermanagerback.moc"



More information about the Commits mailing list