I have made the following changes intended for : CE:UX:MTF / meegotouchcp-bluetooth
Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below https://build.pub.meego.com/request/show/2735 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2735: Messages from BOSS: None State: new 2011-10-24T21:27:29 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_UX_MTF_armv7hl found. accepted on No date Changes: submit: Project:MTF / meegotouchcp-bluetooth -> CE:UX:MTF / meegotouchcp-bluetooth Index: disable_test.patch =================================================================== --- disable_test.patch (revision 0) +++ disable_test.patch (revision 6) @@ -0,0 +1,10 @@ +diff --git a/bluetooth/bluetooth.pro b/bluetooth/bluetooth.pro +index 72df333..fdb2a3e 100644 +--- a/bluetooth/bluetooth.pro ++++ b/bluetooth/bluetooth.pro +@@ -1,3 +1,4 @@ + TEMPLATE = subdirs + CONFIG += ordered +-SUBDIRS += src test ++SUBDIRS += src ++#test Index: BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch =================================================================== --- BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch (revision 0) +++ BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch (revision 6) @@ -0,0 +1,182 @@ +diff --git a/bluetooth/src/bluetoothtogglewidget.cpp b/bluetooth/src/bluetoothtogglewidget.cpp +index 2c122c9..8e1b812 100644 +--- a/bluetooth/src/bluetoothtogglewidget.cpp ++++ b/bluetooth/src/bluetoothtogglewidget.cpp +@@ -27,7 +27,9 @@ BluetoothToggleWidget::BluetoothToggleWidget(MWidget* parent) + //layout->setContentsMargins(0, 0, 0, 0); + TechnologyButton *button = new TechnologyButton("bluetooth", NetworkListModel::instance(), this); + //% "Bluetooth" +- layout->addItem(new MLabel(qtTrId("Bluetooth"), this)); ++ MLabel *label = new MLabel(qtTrId("Bluetooth"), this); ++ label->setStyleName("CommonBodyTextInverted"); ++ layout->addItem(label); + layout->addItem(button); + + connect(button,SIGNAL(toggled(bool)),this,SIGNAL(toggled(bool))); +diff --git a/bluetooth/src/bluetoothvisibilitybutton.cpp b/bluetooth/src/bluetoothvisibilitybutton.cpp +index 8650903..1fc1554 100644 +--- a/bluetooth/src/bluetoothvisibilitybutton.cpp ++++ b/bluetooth/src/bluetoothvisibilitybutton.cpp +@@ -48,7 +48,9 @@ BluetoothVisibilityButton::BluetoothVisibilityButton(QGraphicsItem *parent) : + new MLinearLayoutPolicy(layout, Qt::Horizontal); + + //% "Visible" +- policy->addItem(new MLabel(qtTrId("Visible"),this),Qt::AlignLeft); ++ MLabel *label = new MLabel(qtTrId("Visible"),this); ++ label->setStyleName("CommonBodyTextInverted"); ++ policy->addItem(label,Qt::AlignLeft); + policy->addItem(checkbox,Qt::AlignLeft); + + layout->setPolicy(policy); +diff --git a/bluetooth/src/bluetoothwidget.cpp b/bluetooth/src/bluetoothwidget.cpp +index 1349cea..2bcc951 100644 +--- a/bluetooth/src/bluetoothwidget.cpp ++++ b/bluetooth/src/bluetoothwidget.cpp +@@ -52,7 +52,9 @@ BluetoothWidget::BluetoothWidget(MWidget* parent) + if(adapterpath.path().isEmpty() || adapterpath.path().isNull()) + { + //% "No bluetooth adapter found." +- policy->addItem(new MLabel(qtTrId("No bluetooth adapter found"),this)); ++ MLabel *label = new MLabel(qtTrId("No bluetooth adapter found"),this); ++ label->setStyleName("CommonBodyTextInverted"); ++ policy->addItem(label); + qDebug()<<"Adapter path: "<<adapterpath.path(); + return; + } +diff --git a/bluetooth/src/devicelistwidget.cpp b/bluetooth/src/devicelistwidget.cpp +index a033646..a90215f 100644 +--- a/bluetooth/src/devicelistwidget.cpp ++++ b/bluetooth/src/devicelistwidget.cpp +@@ -112,7 +112,9 @@ DeviceListWidget::DeviceListWidget(MWidget* parent) + if(model->devices().count()) + { + //% "Devices:" +- policy->addItem(new MLabel(qtTrId("Devices:"),this)); ++ MLabel *label = new MLabel(qtTrId("Devices:"),this); ++ label->setStyleName("CommonBodyTextInverted"); ++ policy->addItem(label); + } + + foreach(QDBusObjectPath path, model->devices()) +@@ -132,7 +134,9 @@ void DeviceListWidget::deviceCreated(QDBusObjectPath path) + if(!policy->count()) + { + //% "Devices:" +- policy->addItem(new MLabel(qtTrId("Devices:"),this)); ++ MLabel *label = new MLabel(qtTrId("Devices:"),this); ++ label->setStyleName("CommonBodyTextInverted"); ++ policy->addItem(label); + } + + policy->addItem(item); +diff --git a/bluetooth/src/discoverwidget.cpp b/bluetooth/src/discoverwidget.cpp +index 73ebc4f..8b87d18 100644 +--- a/bluetooth/src/discoverwidget.cpp ++++ b/bluetooth/src/discoverwidget.cpp +@@ -31,7 +31,7 @@ DiscoverWidget::DiscoverWidget(QGraphicsItem *parent) : + + //% "Discover Devices" + label = new MLabel(qtTrId("Discover Devices")); +- ++ label->setStyleName("CommonBodyTextInverted"); + label->setAlignment(Qt::AlignLeft); + + OrgBluezManagerInterface manager( +diff --git a/bluetooth/src/ftptransferwidget.cpp b/bluetooth/src/ftptransferwidget.cpp +index 5139f86..6677765 100644 +--- a/bluetooth/src/ftptransferwidget.cpp ++++ b/bluetooth/src/ftptransferwidget.cpp +@@ -29,7 +29,9 @@ FtpTransferWidget::FtpTransferWidget(QString device, MWidget *parent) : MWidget( + connect(progressSlider, SIGNAL(valueChanged(int)), SLOT(valueChangedSlot(int))); + + statusLabel = new MLabel(this); ++ statusLabel->setStyleName("CommonBodyTextInverted"); + stateLabel = new MLabel(this); ++ stateLabel->setStyleName("CommonBodyTextInverted"); + + policy->addItem(statusLabel); + policy->addItem(progressSlider); +diff --git a/bluetooth/src/nearbydeviceswidget.cpp b/bluetooth/src/nearbydeviceswidget.cpp +index 151ed57..ba59dae 100644 +--- a/bluetooth/src/nearbydeviceswidget.cpp ++++ b/bluetooth/src/nearbydeviceswidget.cpp +@@ -159,6 +159,8 @@ NearbyDevicesWidget::NearbyDevicesWidget(MWidget* parent) + setLayout(layout); + + //% "Nearby Devices:" +- policy->addItem(new MLabel(qtTrId("Nearby Devices:"),this)); ++ MLabel *label = new MLabel(qtTrId("Nearby Devices:"),this); ++ label->setStyleName("CommonBodyTextInverted"); ++ policy->addItem(label); + } + +diff --git a/bluetooth/src/nearbyitem.cpp b/bluetooth/src/nearbyitem.cpp +index 666f849..e476d04 100644 +--- a/bluetooth/src/nearbyitem.cpp ++++ b/bluetooth/src/nearbyitem.cpp +@@ -19,9 +19,9 @@ + + NearbyItem::NearbyItem(QString text, QString alias, MWidget* parent): + MContentItem(MContentItem::SingleTextLabel, parent), +- label(new MLabel(text,parent)), + m_pair(new MAction("Pair",this)) + { ++ setStyleName("CommonContentItemInverted"); + //setObjectName("NearbyItem"); + m_pair->setLocation(MAction::ObjectMenuLocation); + +@@ -35,16 +35,7 @@ NearbyItem::NearbyItem(QString text, QString alias, MWidget* parent): + //connect(this, SIGNAL(clicked()), this, SLOT(pair())); + connect(m_pair, SIGNAL(triggered()), this, SLOT(pair())); + +- + hwaddy = text; +- +- MLayout* layout = new MLayout(this); +- +- MLinearLayoutPolicy *policy = +- new MLinearLayoutPolicy(layout,Qt::Vertical); +- policy->addItem(label); +- +- setLayout(layout); + } + + void NearbyItem::pair() +diff --git a/bluetooth/src/nearbyitem.h b/bluetooth/src/nearbyitem.h +index 71bc779..bb2fad0 100644 +--- a/bluetooth/src/nearbyitem.h ++++ b/bluetooth/src/nearbyitem.h +@@ -24,12 +24,10 @@ public: + NearbyItem(QString text="", QString alias="", MWidget* parent=NULL); + + public slots: +- void setText(QString text){ label->setText(text); } + void pair(); + void browse(); + + private: +- MLabel* label; + QString hwaddy; + MAction* m_pair; + MAction* m_browse; +diff --git a/bluetooth/src/paireditem.cpp b/bluetooth/src/paireditem.cpp +index a33633d..f86e6b6 100644 +--- a/bluetooth/src/paireditem.cpp ++++ b/bluetooth/src/paireditem.cpp +@@ -30,6 +30,7 @@ PairedItem::PairedItem(QString text, QGraphicsItem* parent): + m_connected(false), + isProbing(false) + { ++ setStyleName("CommonContentItemInverted"); + //setObjectName("NearbyItem"); + MAction * m_remove = new MAction("Remove", this); + +diff --git a/bluetoothapplet/src/libbluetoothapplet.css b/bluetoothapplet/src/libbluetoothapplet.css +index f8393b4..6af6a6d 100644 +--- a/bluetoothapplet/src/libbluetoothapplet.css ++++ b/bluetoothapplet/src/libbluetoothapplet.css +@@ -1,3 +1,3 @@ + #BluetoothApplet { +- background-color: #EEEEEE; ++ background-color: black; + } Index: meegotouchcp-bluetooth.yaml =================================================================== --- meegotouchcp-bluetooth.yaml (revision 0) +++ meegotouchcp-bluetooth.yaml (revision 6) @@ -0,0 +1,60 @@ +Name: meegotouchcp-bluetooth +Summary: MeegoTouch Control Panel Bluetooth Plugin +Version: 0.0.9 +Release: 1 +Group: System/GUI/Other +License: Apache License 2.0 +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - BMC16905_Bluetooth_Settings_use_wrong_colour_scheme.patch + - BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch + - BMC16515_bluetooth_applet_dummy_slider_button_removed.patch + - BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch + - disable_test.patch + - desktop-file-changes.patch +Description: | + This is a meegotouch-controlpanel plugin that allows the setup of bluetooth + devices in MeeGo. +PkgBR: + - doxygen +PkgConfigBR: + - QtGui + - connman-qt + - libpulse + - libpulse-mainloop-glib + - meegotouch + - meegotouch-controlpanel +Requires: + - connman +Configure: none +Builder: qmake +Files: + - "%config %{_sysconfdir}/dbus-1/system.d/McpBluetooth.conf" + - "%{_libdir}/duicontrolpanel/applets/libbluetoothapplet.so" + - "%{_datadir}/duicontrolpanel/desktops/bluetooth.desktop" + - "%{_datadir}/l10n/meegotouch/duicontrolpanel-bluetoothapplet.qm" + - "%{_datadir}/themes/base/meegotouch/libbluetoothapplet/style/libbluetoothapplet.css" + +SubPackages: + - Name: libmeegobluetooth + Summary: A library for accessing some of bluez functionality + Group: System/Libraries + Description: | + This library is used by meegotouchcp-bluetooth and other MeeGo Touch Framework + applications. + Files: + - "%{_libdir}/libmeegobluetooth.so.*" + + - Name: libmeegobluetooth-devel + Summary: Development files for libmeegobluetooth + Group: Development/Libraries + Description: | + This package contains the files necessary to develop applications using + libmeegobluetooth. + Files: + - "%{_includedir}/meegobluetooth/*.h" + - "%{_libdir}/libmeegobluetooth.so" + - "%{_libdir}/*.prl" + - "%{_libdir}/pkgconfig/meegobluetooth.pc" + - "%exclude %{_libdir}/meegobluetooth.pc" Index: meegotouchcp-bluetooth.changes =================================================================== --- meegotouchcp-bluetooth.changes (revision 0) +++ meegotouchcp-bluetooth.changes (revision 6) @@ -0,0 +1,47 @@ +* Wed Oct 05 2011 Marko Saukko <[email protected]> - 0.0.9 +- Updated desktop file for newer control panel. + added desktop-file-changes.patch. + +* Fri Aug 26 2011 Miroslav Safr <[email protected]> - 0.0.9 +- disable test build //usr/lib/libconnman-qt.so.0: undefined reference to `NetworkItemModel::onDisconnectComplete(QDBusPendingCallWatcher*)' + +* Tue Jul 05 2011 Alexandr Ivanov <[email protected]> - 0.0.9 +- BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch + Bluetooth controlpanel applet uses inverted style + +* Thu Jun 23 2011 Alexandr Ivanov <[email protected]> - 0.0.9 +- Updated BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch: Enable MLabel's word wrapping + +* Tue May 31 2011 Jukka Selesniemi <[email protected]> - 0.0.9 +- Fixed BMC#16515: Removed obsolete slider button and added translation. + +* Mon May 16 2011 Alexandr Ivanov <[email protected]> - 0.0.9 +- Fixed BMC#16905: Text color in MDialog's + +* Wed May 11 2011 Alexandr Ivanov <[email protected]> - 0.0.9 +- Fixed BMC#16905: Bluetooth Settings use wrong colour scheme resulting in unreadable UI + +* Wed May 11 2011 Kalle Lampila <[email protected]> - 0.0.9 +- Fixed BMC#14959: bluetooth applet - bad applet category in desktop file + +* Wed Apr 06 2011 Fathi Boudra <[email protected]> - 0.0.9 +- Fix desktop file path +- Cleanup the packaging and use qmake builder + +* Mon Sep 20 2010 Kevron Rees <[email protected]> - 0.0.9 +- Fixes BMC #6951 + +* Tue Sep 13 2010 Kevron Rees <[email protected]> - 0.0.8 +- Fixes BMC #6636 + +* Tue Aug 31 2010 Kevron Rees <[email protected]> - 0.0.7 +- Fixes for BMC #6120, 6121 + +* Fri Aug 27 2010 Kevron Rees <[email protected]> - 0.0.6 +- Fixes for BMC #5950 (hfp support) and #5960 (pkgconfig file) + +* Thu Aug 26 2010 Kevron Rees <[email protected]> - 0.0.5 +- Fixes BMC #5840 and #5885 + +* Fri Aug 18 2010 Kevron Rees <[email protected]> - 0.0.4 +- Initial import of project. meegotouchcp-bluetooth is a meegotouch controlpanel applet for setting up bluetooth devices Index: BMC16905_Bluetooth_Settings_use_wrong_colour_scheme.patch =================================================================== --- BMC16905_Bluetooth_Settings_use_wrong_colour_scheme.patch (revision 0) +++ BMC16905_Bluetooth_Settings_use_wrong_colour_scheme.patch (revision 6) @@ -0,0 +1,121 @@ +From d37f5fc4d8d02fb5727b7c2db9ee532baf6f74e1 Mon Sep 17 00:00:00 2001 +From: Alexandr Ivanov <[email protected]> +Date: Wed, 11 May 2011 16:33:22 +0300 +Subject: [PATCH] Fixes: BMC#16905 - Bluetooth Settings use wrong colour scheme resulting in unreadable UI + +RevBy: + +Details: Added simple styling support +--- + bluetoothapplet/src/bluetoothapplet.cpp | 14 ++++++-------- + bluetoothapplet/src/bluetoothapplet.css | 5 ----- + bluetoothapplet/src/bluetoothapplet.h | 4 ++-- + bluetoothapplet/src/libbluetoothapplet.css | 3 +++ + bluetoothapplet/src/src.pro | 4 ++-- + 5 files changed, 13 insertions(+), 17 deletions(-) + delete mode 100644 bluetoothapplet/src/bluetoothapplet.css + create mode 100644 bluetoothapplet/src/libbluetoothapplet.css + +diff --git a/bluetoothapplet/src/bluetoothapplet.cpp b/bluetoothapplet/src/bluetoothapplet.cpp +index 89e763b..a7e06f7 100644 +--- a/bluetoothapplet/src/bluetoothapplet.cpp ++++ b/bluetoothapplet/src/bluetoothapplet.cpp +@@ -15,26 +15,24 @@ + #include <MTheme> + #include <MLinearLayoutPolicy> + #include <MLayout> ++#include <MLibrary> + #include <DcpWidget> ++#include <DcpStylableWidget> + #include "bluetoothapplet.h" + #include "bluetoothwidget.h" + #include "bluetoothbrief.h" + + Q_EXPORT_PLUGIN2(bluetoothapplet, BluetoothApplet) ++M_LIBRARY + + void BluetoothApplet::init() + { +- MTheme::loadCSS(QString(CSSDIR) + "skeletonapplet.css"); + }; + +-DcpWidget* BluetoothApplet::constructWidget(int) ++DcpStylableWidget* BluetoothApplet::constructStylableWidget(int viewId) + { +- return pageMain(); +-} +- +-DcpWidget* BluetoothApplet::pageMain() +-{ +- DcpWidget* widget = new DcpWidget(); ++ DcpStylableWidget* widget = new DcpStylableWidget(); ++ widget->setStyleName("BluetoothApplet"); + + MLayout *layout = new MLayout(widget); + MLinearLayoutPolicy * policy = new MLinearLayoutPolicy(layout,Qt::Vertical); +diff --git a/bluetoothapplet/src/bluetoothapplet.css b/bluetoothapplet/src/bluetoothapplet.css +deleted file mode 100644 +index 83e015b..0000000 +--- a/bluetoothapplet/src/bluetoothapplet.css ++++ /dev/null +@@ -1,5 +0,0 @@ +-#LabelAbout { +- color: #FFFFFF; +- font: "Nokia Sans Cn" 16; +-} +- +diff --git a/bluetoothapplet/src/bluetoothapplet.h b/bluetoothapplet/src/bluetoothapplet.h +index a64277d..b4acb8f 100644 +--- a/bluetoothapplet/src/bluetoothapplet.h ++++ b/bluetoothapplet/src/bluetoothapplet.h +@@ -21,6 +21,7 @@ + #include <DcpAppletIf> + #include <QObject> + class DcpWidget; ++class DcpStylableWidget; + class MAction; + + class BluetoothApplet : public QObject, public DcpAppletIf +@@ -30,9 +31,8 @@ class BluetoothApplet : public QObject, public DcpAppletIf + + public: + virtual void init(); +- virtual DcpWidget* constructWidget(int widgetId); ++ virtual DcpStylableWidget* constructStylableWidget(int viewId); + +- virtual DcpWidget* pageMain(); + /* Applet can have more 'pages'. Each page must be a DcpWidget subclass + virtual DcpWidget* page1(); + virtual DcpWidget* page2(); +diff --git a/bluetoothapplet/src/libbluetoothapplet.css b/bluetoothapplet/src/libbluetoothapplet.css +new file mode 100644 +index 0000000..f8393b4 +--- /dev/null ++++ b/bluetoothapplet/src/libbluetoothapplet.css +@@ -0,0 +1,3 @@ ++#BluetoothApplet { ++ background-color: #EEEEEE; ++} +diff --git a/bluetoothapplet/src/src.pro b/bluetoothapplet/src/src.pro +index 17a300c..7dd46ff 100644 +--- a/bluetoothapplet/src/src.pro ++++ b/bluetoothapplet/src/src.pro +@@ -17,13 +17,13 @@ HEADERS = bluetoothapplet.h \ + SOURCES = bluetoothapplet.cpp \ + bluetoothbrief.cpp \ + +-css.files = bluetoothapplet.css + DESTDIR = ../lib + TARGET = $$qtLibraryTarget(bluetoothapplet) + desktop.files += *.desktop + desktop.path = $$DCP_DESKTOP_DIR + target.path += $$DCP_APPLET_DIR +-css.path += $$DCP_THEME_DIR/style ++css.files = libbluetoothapplet.css ++css.path = $$M_THEME_DIR/base/meegotouch/libbluetoothapplet/style + dbusconfig.files = McpBluetooth.conf + dbusconfig.path = $$INSTALL_ROOT/etc/dbus-1/system.d/ + +-- +1.6.1 + Index: meegotouchcp-bluetooth.spec =================================================================== --- meegotouchcp-bluetooth.spec (revision 0) +++ meegotouchcp-bluetooth.spec (revision 6) @@ -0,0 +1,137 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +# << macros + +Name: meegotouchcp-bluetooth +Summary: MeegoTouch Control Panel Bluetooth Plugin +Version: 0.0.9 +Release: 1 +Group: System/GUI/Other +License: Apache License 2.0 +Source0: %{name}-%{version}.tar.bz2 +Source100: meegotouchcp-bluetooth.yaml +Patch0: BMC16905_Bluetooth_Settings_use_wrong_colour_scheme.patch +Patch1: BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch +Patch2: BMC16515_bluetooth_applet_dummy_slider_button_removed.patch +Patch3: BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch +Patch4: disable_test.patch +Patch5: desktop-file-changes.patch +Requires: connman +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(connman-qt) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-mainloop-glib) +BuildRequires: pkgconfig(meegotouch) +BuildRequires: pkgconfig(meegotouch-controlpanel) +BuildRequires: doxygen + + +%description +This is a meegotouch-controlpanel plugin that allows the setup of bluetooth +devices in MeeGo. + + + +%package libmeegobluetooth +Summary: A library for accessing some of bluez functionality +Group: System/Libraries +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description libmeegobluetooth +This library is used by meegotouchcp-bluetooth and other MeeGo Touch Framework +applications. + + +%package libmeegobluetooth-devel +Summary: Development files for libmeegobluetooth +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description libmeegobluetooth-devel +This package contains the files necessary to develop applications using +libmeegobluetooth. + + + +%prep +%setup -q -n %{name}-%{version} + +# BMC16905_Bluetooth_Settings_use_wrong_colour_scheme.patch +%patch0 -p1 +# BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch +%patch1 -p1 +# BMC16515_bluetooth_applet_dummy_slider_button_removed.patch +%patch2 -p1 +# BMC20095_Bluetooth_and_Wifi_applets_cause_conflict_when_loading_theme.patch +%patch3 -p1 +# disable_test.patch +%patch4 -p1 +# desktop-file-changes.patch +%patch5 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qmake + +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake_install + +# >> install post +# << install post + + + + + + + +%post libmeegobluetooth -p /sbin/ldconfig + +%postun libmeegobluetooth -p /sbin/ldconfig + + + + +%files +%defattr(-,root,root,-) +%config %{_sysconfdir}/dbus-1/system.d/McpBluetooth.conf +%{_libdir}/duicontrolpanel/applets/libbluetoothapplet.so +%{_datadir}/duicontrolpanel/desktops/bluetooth.desktop +%{_datadir}/l10n/meegotouch/duicontrolpanel-bluetoothapplet.qm +%{_datadir}/themes/base/meegotouch/libbluetoothapplet/style/libbluetoothapplet.css +# >> files +# << files + + +%files libmeegobluetooth +%defattr(-,root,root,-) +%{_libdir}/libmeegobluetooth.so.* +# >> files libmeegobluetooth +# << files libmeegobluetooth + +%files libmeegobluetooth-devel +%defattr(-,root,root,-) +%{_includedir}/meegobluetooth/*.h +%{_libdir}/libmeegobluetooth.so +%{_libdir}/*.prl +%{_libdir}/pkgconfig/meegobluetooth.pc +%exclude %{_libdir}/meegobluetooth.pc +# >> files libmeegobluetooth-devel +# << files libmeegobluetooth-devel + Index: meegotouchcp-bluetooth-0.0.9.tar.bz2 =================================================================== Binary file meegotouchcp-bluetooth-0.0.9.tar.bz2 added Index: BMC16515_bluetooth_applet_dummy_slider_button_removed.patch =================================================================== --- BMC16515_bluetooth_applet_dummy_slider_button_removed.patch (revision 0) +++ BMC16515_bluetooth_applet_dummy_slider_button_removed.patch (revision 6) @@ -0,0 +1,83 @@ +diff -Nur meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetoothapplet.cpp meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetoothapplet.cpp +--- meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetoothapplet.cpp 2011-05-17 09:13:04.202829818 +0300 ++++ meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetoothapplet.cpp 2011-05-17 10:23:09.432538614 +0300 +@@ -50,7 +50,7 @@ + + QString BluetoothApplet::title() const + { +- //% "Bluetooth applet" ++ //% "Bluetooth" + return qtTrId("dcp_bluetooth_appl_titl"); + } + +diff -Nur meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetoothbrief.cpp meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetoothbrief.cpp +--- meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetoothbrief.cpp 2011-05-17 09:13:04.202829818 +0300 ++++ meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetoothbrief.cpp 2011-05-17 10:20:42.673554059 +0300 +@@ -12,36 +12,24 @@ + + #include <DcpWidgetTypes> + #include "bluetoothbrief.h" +-#include <QtDebug> + +-BluetoothBrief::BluetoothBrief() ++BluetoothBrief::BluetoothBrief() : DcpBrief() + { + + } + +-QString BluetoothBrief::valueText() const ++BluetoothBrief::~BluetoothBrief() + { +- return ""; +-} +- +-QString BluetoothBrief::titleText() const +-{ +- return "Bluetooth Devices"; +-} + +-bool BluetoothBrief::toggle() const +-{ +- return m_ToggleState; + } + +-void BluetoothBrief::setToggle (bool toggle) ++QString BluetoothBrief::titleText() const + { +- m_ToggleState = toggle; +- qDebug() << "bluetooth brief got toggle state:" << toggle; ++ //% "Bluetooth" ++ return qtTrId("qtn_bluetooth_brief_title"); + } + + int BluetoothBrief::widgetTypeID() const + { +- return DCPLABELBUTTON; ++ return DcpWidgetType::Label; + } +- +diff -Nur meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetoothbrief.h meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetoothbrief.h +--- meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetoothbrief.h 2011-05-17 09:13:04.202829818 +0300 ++++ meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetoothbrief.h 2011-05-17 10:21:49.840702814 +0300 +@@ -18,17 +18,9 @@ + Q_OBJECT + public: + BluetoothBrief(); +- virtual QString valueText() const; +- virtual QString titleText() const; +- +- virtual bool toggle() const; +- virtual void setToggle (bool toggle); +- virtual int widgetTypeID() const; +- +-private: +- bool m_ToggleState; +- int m_Value; ++ virtual ~BluetoothBrief(); ++ QString titleText() const; ++ int widgetTypeID() const; + }; + +- +-#endif // SKELETONBRIEF ++#endif // BLUETOOTHBRIEF_H Index: BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch =================================================================== --- BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch (revision 0) +++ BMC16905_Bluetooth_Settings_use_wrong_colour_scheme_2.patch (revision 6) @@ -0,0 +1,59 @@ +diff --git a/bluetooth/src/bluetoothagent.cpp b/bluetooth/src/bluetoothagent.cpp +index 4510c53..25442a2 100644 +--- a/bluetooth/src/bluetoothagent.cpp ++++ b/bluetooth/src/bluetoothagent.cpp +@@ -83,7 +83,10 @@ void BluetoothAgent::requestConfirmation(OrgBluezDeviceInterface &device, uint k + M::YesButton | M::NoButton); + + //% "Pairing with %1 with key: %2" where %1 is the alias and %2 is the key +- dialog->setCentralWidget( new MLabel(qtTrId("Pairing with %1 with key: %2").arg(alias).arg(QString::number(key)))); ++ MLabel *label = new MLabel(qtTrId("Pairing with %1 with key: %2").arg(alias).arg(QString::number(key))); ++ label->setStyleName("CommonBodyTextInverted"); ++ label->setWordWrap(true); ++ dialog->setCentralWidget( label ); + + connect(dialog,SIGNAL(rejected()),this,SLOT(cancel())); + +@@ -102,8 +105,10 @@ uint BluetoothAgent::requestPasskey(OrgBluezDeviceInterface &device) + + //% "Please Enter PassKey on %1" where %1 is the bluetooth device alias. + QString text = qtTrId("Please Enter PassKey on %1:").arg(props["Alias"].toString()); +- + MLabel *label = new MLabel(text, centralWidget); ++ label->setStyleName("CommonBodyTextInverted"); ++ label->setWordWrap(true); ++ + MTextEdit *textEdit = new MTextEdit(MTextEditModel::SingleLine, + QString(), + centralWidget); +@@ -132,8 +137,9 @@ QString BluetoothAgent::requestPidCode(OrgBluezDeviceInterface &device) + + //%"Please enter the PIN for %1:" where %1 is the device alias. + QString text = qtTrId("Please enter the PIN for %1:").arg(props["Alias"].toString()); +- + MLabel *label = new MLabel(text, centralWidget); ++ label->setStyleName("CommonBodyTextInverted"); ++ label->setWordWrap(true); + + MTextEdit *textEdit = new MTextEdit(MTextEditModel::SingleLine, + QString(), +diff --git a/bluetooth/src/paireditem.cpp b/bluetooth/src/paireditem.cpp +index 1b42089..a33633d 100644 +--- a/bluetooth/src/paireditem.cpp ++++ b/bluetooth/src/paireditem.cpp +@@ -192,10 +192,12 @@ void PairedItem::remove() + MDialog* dialog = new MDialog("Remove device", + M::CancelButton| M::OkButton); + +- MLabel* dialogDialog = new MLabel(this); +- dialogDialog->setText(QString("Do you want to remove %1?").arg(title())); ++ MLabel* label = new MLabel(this); ++ label->setText(QString("Do you want to remove %1?").arg(title())); ++ label->setStyleName("CommonBodyTextInverted"); ++ label->setWordWrap(true); + +- dialog->setCentralWidget(dialogDialog); ++ dialog->setCentralWidget(label); + + int status = dialog->exec(); + Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (revision 6) @@ -0,0 +1,6 @@ +PKG_NAME := meegotouchcp-bluetooth +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + +include /usr/share/packaging-tools/Makefile.common + Index: desktop-file-changes.patch =================================================================== --- desktop-file-changes.patch (revision 0) +++ desktop-file-changes.patch (revision 6) @@ -0,0 +1,25 @@ +diff -ruN --exclude='*~' meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetooth.desktop meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetooth.desktop +--- meegotouchcp-bluetooth-0.0.9.orig/bluetoothapplet/src/bluetooth.desktop 2011-10-05 14:02:55.915749126 +0300 ++++ meegotouchcp-bluetooth-0.0.9/bluetoothapplet/src/bluetooth.desktop 2011-10-05 14:06:23.556328963 +0300 +@@ -1,8 +1,11 @@ + [Desktop Entry] + Type=DUIApplet + Name=Bluetooth +-Icon= +-Exec= ++X-translation-catalog = duicontrolpanel-bluetoothapplet ++X-Maemo-Service=com.nokia.DuiControlPanel ++X-Maemo-Method=com.nokia.DuiControlPanelIf.appletPage ++X-Maemo-Object-Path=/ ++X-Maemo-Fixed-Args=Bluetooth + + [DUI] + X-DUIApplet-Applet=libbluetoothapplet.so +@@ -10,6 +13,6 @@ + X-DUIApplet-ImagePortrait=Widget_portrait_weather.png + + [DCP] +-Category=Connectivity ++Category=Connections + Order=4 +
