[kmobiletools] branches/extragear/kde3/pim/kmobiletools
Marco Gulino
marco at kmobiletools.org
Wed Jun 6 23:17:30 CEST 2007
SVN commit 672371 by gulino:
Removing KBluetoothpairingwizard.
M +2 -2 Makefile.am
D kbluetoothpairingwizard (directory)
M +1 -21 kmobiletools/mainpart/newdevicewizard.cpp
M +7 -59 kmobiletools/mainpart/ui_newdevicewizard.ui
--- branches/extragear/kde3/pim/kmobiletools/Makefile.am #672370:672371
@@ -11,8 +11,8 @@
TESTS_DIR = tests
endif
-SUBDIRS = kmobiletools $(KONTACT_PLUGIN_SUBDIR) kbluetoothpairingwizard kmtsetup $(KIOSLAVES_DIR) $(TESTS_DIR)
-DIST_SUBDIRS = kmobiletools kmobiletools-kontact-plugin mobile-kioslaves tests kbluetoothpairingwizard kmtsetup
+SUBDIRS = kmobiletools $(KONTACT_PLUGIN_SUBDIR) kmtsetup $(KIOSLAVES_DIR) $(TESTS_DIR)
+DIST_SUBDIRS = kmobiletools kmobiletools-kontact-plugin mobile-kioslaves tests kmtsetup
# mobile-kioslaves
# $(KONTACT_PLUGIN_SUBDIR) $(KSYNC_PLUGIN_SUBDIR) kmobiletools_singleDeviceTest mobile-kioslaves
--- branches/extragear/kde3/pim/kmobiletools/kmobiletools/mainpart/newdevicewizard.cpp #672370:672371
@@ -118,8 +118,6 @@
monitor=0;
#endif
-#else
- connect( btwizard, SIGNAL(clicked()), this, SLOT(btWizard()));
#endif
advoptstab->hide();
@@ -154,6 +152,7 @@
// btwizard->setIconSet(QIconSet (wizardLogoPixmap) );
btStack->raiseWidget(0);
#else
+ btenable->setEnabled(false);
btStack->raiseWidget(1);
#endif
resize(minimumSize());
@@ -500,8 +499,6 @@
btsvcLV->clear();
bturl=QString::null;
btStartScan();
-#else
- KRun::runCommand("kbluetoothpairingwizard");
#endif
}
@@ -643,23 +640,6 @@
engineDescLabel->setText(engInfo->property("X-KMobileTools-LongDesc").asString().replace('\n',"<br>") );
setNextEnabled ( currentPage(), true );
enginelibname=engInfo->service()->library();
-/*
- switch( i ){
- case 0:
- engineDescLabel->setText(i18n("<qt>AT Engine<br><a href=\"http://www.kmobiletools.org\">KMobileTools</a> default engine, developed interally by the KMobileTools team.<br>Good choice with almost all mobile phones, but on some models it lacks advanced features. Best choice with Motorola Phones, works good also with Sony Ericsson and Siemens.</qt>"));
- enginelibname="libkmobiletools_at"; break;
-#ifdef WITH_GAMMU
- case 1:
- setNextEnabled ( currentPage(), false );
- engineDescLabel->setText(i18n("<qt>Gammu Engine.<br>Uses <a href=\"http://www.gammu.org\">Gammu</a> to communicate with the mobile phone.<br>It's the best selection above all for Nokia mobile phones.<br></qt>") + engineNotWorking);
- enginelibname="libkmobiletools_gammu";
- return;
-#endif
- default:
- setNextEnabled ( currentPage(), false );
- return;
- }
- setNextEnabled ( currentPage(), true );*/
}
--- branches/extragear/kde3/pim/kmobiletools/kmobiletools/mainpart/ui_newdevicewizard.ui #672370:672371
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>645</width>
- <height>713</height>
+ <height>710</height>
</rect>
</property>
<property name="sizePolicy">
@@ -294,11 +294,11 @@
<attribute name="id">
<number>0</number>
</attribute>
- <vbox>
+ <grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KActiveLabel">
+ <widget class="KActiveLabel" row="0" column="0">
<property name="name">
<cstring>btnoticelabel</cstring>
</property>
@@ -330,63 +330,15 @@
</property>
<property name="text">
<string><qt>It seems that you don't have installed KDEBluetooth version 1.0 beta2 or above. This will disable kdebluetooth integration in kmobiletools.<br>
-You will have to bind bluetooth devices manually, or with the bluetooth pairing wizard. Please read documentation in your distribution to learn how to bind your bluetooth devices, or click the button below to start Bluetooth Pairing Wizard<br>
-<font color="red">Important Note:</font> the Bluetooth Pairing Wizard is not maintained and so it's considered deprecated. Bugs about Bluetooth Pairing Wizard won't be accepted, since it has to be deleted as soon as possible. It's still here just to aid in case everything else fails.
+You will have to bind bluetooth devices manually with the rfcomm application bundled with bluez-utils. Please read documentation in your distribution to learn how to bind your bluetooth devices.<br>
</qt></string>
</property>
<property name="wordWrap">
<enum>WidgetWidth</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <spacer row="1" column="0">
<property name="name">
- <cstring>layout15</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>spacer16</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>241</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="KPushButton">
- <property name="name">
- <cstring>btwizard</cstring>
- </property>
- <property name="text">
- <string>&Bluetooth Pairing Wizard</string>
- </property>
- <property name="accel">
- <string>Alt+B</string>
- </property>
- <property name="default">
- <bool>false</bool>
- </property>
- <property name="iconSet">
- <iconset>image1</iconset>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- </hbox>
- </widget>
- <spacer>
- <property name="name">
<cstring>spacer17_2</cstring>
</property>
<property name="orientation">
@@ -402,7 +354,7 @@
</size>
</property>
</spacer>
- </vbox>
+ </grid>
</widget>
<widget class="QWidget">
<property name="name">
@@ -1259,7 +1211,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image2</pixmap>
+ <pixmap>image1</pixmap>
</customwidget>
</customwidgets>
<images>
@@ -1267,9 +1219,6 @@
<data format="XPM.GZ" length="4833">789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3f
a37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6
f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e
114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
</image>
<image name="image1">
- <data format="PNG" length="579">89504e470d0a1a0a0000000d494844520000000a0000001008060000002f7fee400000020a494441542891358c4d48546118859fefbd7706b552492523c814838a8a242277831b37e1a204d1a0202a4a840c825c8641aba8362e8a36fdb84950b476854921a19b0c9bc22c3446b252c799699cfb7fefd742e7c0d99ce79ca300ea2f0f1a373b9abb4dd3bca2943a045851148d6772f9db7da78f7e0450fb2e3d377adb9b8794113ba3356800ad0110859bc9ac77f6771e1f55fd235f7b026203d126a3669bc1ca46006c8e4c15e53e4f4d1c30d305dd6d873e4572eac84e52699b3773b9ad7b2a76eddd7fde5c2b04070bbea2983abea6fdc46e36dc90b1d92c00712b6892752b94821bd093a8c5f5239c20e2d1db14ad87ab4934ee606d232467f9a6e41ccdef7cc4fc8ac3bd8e064a4d45459941494c482edb649d08cbd39876a029f870777c153fd45c6fadc3f6422e3ef9c6879f360065218846d0082861623e8fe787a4d216c93f1e2863cb828808621834ed29e1f1b94616d72c1c2f64f0420395a582188288429408db6330d059c78de1145f961d9e4ea731145c4b54234a504a1053d43f3b32697bb8c0d452000a7a5b6ac9d811f7df65502218916749a9a95f03e47da1a854c6e7ea8b5fb8a1226e28a2bfc9f75219a
6fbcbe3da2a9626bfe7e81eda2c01945b8bb3d3cf6e0dcb585f4bb2ca4bb557c5fd55a5e0d59c871b2a4a4c4595fde3d3c2e89db3444156159fea135d35f527dbba2c1d3f86ef04eed2cce4ccc88397e8280bf01fd2d8f484061bc72d0000000049454e44ae426082</data>
- </image>
- <image name="image2">
<data format="PNG" length="570">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000020149444154388dad92bf6b5a5118869f9b5863d168ea8f250e8e85dc214521430bd9ba6468da29e096ad50028edd4aa7fc07813864712b8e5e0874b4740a48c1a1903f416e3b78f2a9e7a8a743bd46a9865ecd0b1fbce77ce77b38bce70094819f807d84ba05de0369806fcd66d3f6fbfdffaacbcbcba5bd66b3698116f07c0378e5ba2e228288d068341ef45a6b4484582cf64fb9ae0bf002c86c0028a5504ae1791e07070773def33c9452f47a3d9452f4fb7d9452d46a356655abd5504a05cbed3970a954e2fafa7ace974aa539f0603098f6abd52a00d56a757a6ea2cd4de0a8582ce693c92422422693e1eeee0e11219bcd4ea3087cbbdd269fcf4ff7f6f6f6d8dfdf4744b8b9b9c1f3bc5be0ab3379c58fc7c7c70511c15acbaaf27d9f56ab05f026027c01be8bc88f7abdbe16783c1e934ea7019e4400017e596b198d461cbe3b24914a10dd8a86065f7cba08ac8d007a02c718432295a0e01648e552a1c1c3e1f01e6cad1d3b8e638246742b4a2a9722bd9b5e073c8acc36b4d65c9d5f850606ea743a533f071e0e879c7c382157c811df8e870657de5616838d3144635176b23b2b65acb57e00bc46c6c698c560ad35e795f
3d0c040beef2f061b6338fb7cb672c6e597e5e5e075329ef96e8f9bf1c2c7f37d9f6eb7cbe9d1e9df8d5e682e3d7d3fe4586b711c270ea8e523a1f53ab8f108d89dd433e0e91ad01ef0fb0f330f6e57a01a53e50000000049454e44ae426082</data>
</image>
</images>
@@ -1280,7 +1229,6 @@
<includehint>keycombobox.h</includehint>
<includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint>
- <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>kactivelabel.h</includehint>
More information about the kmobiletools
mailing list