FCL/sf/mw/hb: comparison src/hbinput/inputwidgets/hbinputsettinglist.cpp

equal deleted inserted replaced

-:c3690ec91ef8
+:923ff622b8b9
 #include "hbinputsettinglist.h"
 #include <QGraphicsLinearLayout>
 #include <QGraphicsGridLayout>
+#include <hbmainwindow.h>
 #include <hblabel.h>
 #include <hbpushbutton.h>
 #include <hblistwidget.h>
 #include <hblistwidgetitem.h>
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinpututils.h>
 #include <hbinputpredictionfactory.h>
 #include <hbinputregioncollector_p.h>
+#include <hbinputmethodselectionlist.h>
 #include "hbdialog_p.h"
 const QString settingsIcon("qtg_mono_settings");
 const QString inputMethodIcon("qtg_mono_virtual_input");
+const qreal HbSelectionListMarginInUnits = 0.8;
+const qreal HbSelectionListLandscapeAlignInUnits = 9.4;
 /// @cond
 class HbInputSettingListPrivate : public HbDialogPrivate
 {
+Q_DECLARE_PUBLIC(HbInputSettingList)
 public:
 HbInputSettingListPrivate();
+~HbInputSettingListPrivate();
 qreal languageNameWidth();
+void showInputMethodSelectionList();
 public:
 HbPushButton *mLanguageButton;
 HbPushButton *mPredictionButton;
 HbListWidget *mOptionList;
 HbInputLanguage mPrimaryLanguage;
 HbInputLanguage mSecondaryLanguage;
 QList<QString> mPredictionValues;
+HbInputMethodSelectionList *mInputMethodSelectionList;
 };
 HbInputSettingListPrivate::HbInputSettingListPrivate()
-: mLanguageButton(0), mPredictionButton(0), mOptionList(0)
+: mLanguageButton(0), mPredictionButton(0), mOptionList(0), mInputMethodSelectionList(0)
 {
+}
+HbInputSettingListPrivate::~HbInputSettingListPrivate()
+{
+delete mInputMethodSelectionList;
 }
 qreal HbInputSettingListPrivate::languageNameWidth()
 {
 qreal nameWidth(0);
 }
 return nameWidth;
 }
+void HbInputSettingListPrivate::showInputMethodSelectionList()
+{
+Q_Q(HbInputSettingList);
+delete mInputMethodSelectionList;
+mInputMethodSelectionList = new HbInputMethodSelectionList();
+mInputMethodSelectionList->setObjectName("Input method selection list");
+qreal unitValue = HbDeviceProfile::profile(q->mainWindow()).unitValue();
+QPointF position(q->scenePos().x() + q->size().width(),
+mOptionList->scenePos().y() - HbSelectionListMarginInUnits * unitValue);
+if (q->mainWindow()->orientation() == Qt::Horizontal) {
+position.setX(position.x() - HbSelectionListLandscapeAlignInUnits * unitValue);
+}
+mInputMethodSelectionList->setPreferredPos(position, HbPopup::BottomRightCorner);
+QObject::connect(mInputMethodSelectionList, SIGNAL(inputMethodSelected(const HbInputMethodDescriptor &, const QByteArray &)),
+q, SLOT(closeSettings(const HbInputMethodDescriptor &, const QByteArray &)));
+mInputMethodSelectionList->show();
+}
 /// @endcond
 /*!
 Constructs input setting list
 */
 HbInputSettingList::HbInputSettingList(QGraphicsWidget *parent)
 : HbDialog(*new HbInputSettingListPrivate(), parent)
 {
 Q_D(HbInputSettingList);
 HbInputRegionCollector::instance()->attach(this);
+// Get correct size from style parameters
+HbStyle style;
+qreal listWidth(300);
+style.parameter(QString("expr(var(hb-param-screen-short-edge)-(2*var(hb-param-margin-gene-screen)))"), listWidth);
+qreal margin(5);
+style.parameter(QString("hb-param-margin-gene-popup"), margin);
 QGraphicsLinearLayout *mainLayout = new QGraphicsLinearLayout(Qt::Vertical);
 QGraphicsGridLayout *gridLayout = new QGraphicsGridLayout();
 HbLabel *languageLabel = new HbLabel(tr("Language"), this);
 d->mOptionList = new HbListWidget(this);
 d->mOptionList->setFontSpec(HbFontSpec(HbFontSpec::Primary));
 d->mOptionList->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
 d->mOptionList->setObjectName("Input options list");
 d->mOptionList->addItem(HbIcon(settingsIcon), tr("Input settings"));
-d->mOptionList->setPreferredWidth(300);
+d->mOptionList->setContentsMargins(0, 0, 0, 0);
+d->mOptionList->setPreferredWidth(listWidth - 2 * margin);
 gridLayout->addItem(languageLabel, 0, 0);
 gridLayout->addItem(d->mLanguageButton, 0, 1);
 gridLayout->addItem(predictionLabel, 1, 0);
 gridLayout->addItem(d->mPredictionButton, 1, 1);
+gridLayout->setContentsMargins(0, 0, 0, 0);
-qreal buttonWidth = 30 + d->languageNameWidth();
-gridLayout->setColumnFixedWidth(0, 300 - buttonWidth);
+// Width for language button is based on the width of language name string and button margins
-gridLayout->setColumnFixedWidth(1, buttonWidth);
+qreal buttonMargin(20);
+style.parameter(QString("expr(var(hb-param-margin-gene-left)+var(hb-param-margin-gene-right))"), buttonMargin);
-qreal buttonHeight = buttonWidth * 0.4;
+gridLayout->setColumnFixedWidth(1, buttonMargin + d->languageNameWidth());
-gridLayout->setRowFixedHeight(0, buttonHeight);
-gridLayout->setRowFixedHeight(1, buttonHeight);
 mainLayout->addItem(gridLayout);
 mainLayout->addItem(d->mOptionList);
+mainLayout->setContentsMargins(0, 0, 0, 0);
 QGraphicsWidget *content = new QGraphicsWidget(this);
+content->setContentsMargins(0, 0, 0, 0);
 content->setLayout(mainLayout);
 setContentWidget(content);
 d->mPredictionValues.append(tr("Off"));
 d->mPredictionValues.append(tr("On"));
 // set default values for popup
 setTimeout(HbDialog::NoTimeout);
 setBackgroundFaded(false);
 setDismissPolicy(TapOutside);
+setContentsMargins(margin, margin, margin, margin);
-// Make sure the custom button list never steals focus.
+setPreferredWidth(listWidth);
+// Make sure the input settings list never steals focus.
 setFlag(QGraphicsItem::ItemIsPanel, true);
 setActive(false);
 connect(d->mLanguageButton, SIGNAL(clicked(bool)), this, SLOT(languageButtonClicked()));
 connect(d->mPredictionButton, SIGNAL(clicked(bool)), this, SLOT(predictionButtonClicked()));
 HbInputSettingProxy *settings = HbInputSettingProxy::instance();
 connect(settings, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), this, SLOT(primaryLanguageChanged(const HbInputLanguage &)));
 connect(settings, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), this, SLOT(secondaryLanguageChanged(const HbInputLanguage &)));
 connect(settings, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(predictionStatusChanged(HbKeyboardSettingFlags, bool)));
+connect(this, SIGNAL(aboutToClose()), this, SLOT(aboutToClose()));
 }
 /*!
 Destructs the object.
 */
 d->mSecondaryLanguage = settings->globalSecondaryInputLanguage();
 d->mLanguageButton->setText(d->mPrimaryLanguage.localisedName());
 d->mPredictionButton->setText(d->mPredictionValues.at(settings->predictiveInputStatusForActiveKeyboard()));
-QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
+QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods(mainWindow()->orientation(), d->mPrimaryLanguage);
 bool showInputMethod = true;
 if (customList.count() < 1) {
 showInputMethod = false;
 }
 void HbInputSettingList::setPredictionSelectionEnabled(bool enabled)
 {
 Q_D(HbInputSettingList);
 d->mPredictionButton->setEnabled(enabled);
+}
+/*!
+Closes input method selection if settings is closed
+*/
+void HbInputSettingList::aboutToClose()
+{
+Q_D(HbInputSettingList);
+if (d->mInputMethodSelectionList) {
+d->mInputMethodSelectionList->close();
+}
 }
 /*!
 Swaps current primary and secondary languages
 */
 {
 Q_D(HbInputSettingList);
 if (d->mOptionList->row(item) == d->mOptionList->count() - 1) {
 emit inputSettingsButtonClicked();
+close();
 } else {
-emit inputMethodsButtonClicked();
+d->showInputMethodSelectionList();
 }
-close();
 }
 /*!
 Sets current primary language and updates the language button text
 */
 bool status = HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard();
 d->mPredictionButton->setText(d->mPredictionValues.at(status));
 }
+/*!
+Closes settings and emits inputMethodSelected signal with given parameter
+*/
+void HbInputSettingList::closeSettings(const HbInputMethodDescriptor &descriptor, const QByteArray &customData)
+{
+close();
+emit inputMethodSelected(descriptor, customData);
+}
 // End of file

changeset 7	923ff622b8b9
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55