diff --git a/applets/pager/package/contents/config/main.xml b/applets/pager/package/contents/config/main.xml --- a/applets/pager/package/contents/config/main.xml +++ b/applets/pager/package/contents/config/main.xml @@ -31,15 +31,6 @@ 0 - - - - - - - - 0 - diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml --- a/applets/pager/package/contents/ui/configGeneral.qml +++ b/applets/pager/package/contents/ui/configGeneral.qml @@ -38,7 +38,6 @@ property int cfg_displayedText property alias cfg_showWindowIcons: showWindowIcons.checked property int cfg_currentDesktopSelected - property alias cfg_pagerLayout: pagerLayout.currentIndex property alias cfg_showOnlyCurrentScreen: showOnlyCurrentScreen.checked onCfg_displayedTextChanged: { @@ -132,18 +131,6 @@ } QtControls.Label { - text: i18n("Layout:") - Layouts.Layout.alignment: Qt.AlignVCenter|Qt.AlignRight - visible: isActivityPager - } - - QtControls.ComboBox { - id: pagerLayout - model: [i18nc("The pager layout", "Default"), i18n("Horizontal"), i18n("Vertical")] - visible: isActivityPager - } - - QtControls.Label { text: i18n("Selecting current desktop:") Layouts.Layout.alignment: Qt.AlignVCenter|Qt.AlignRight } diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml --- a/applets/pager/package/contents/ui/main.qml +++ b/applets/pager/package/contents/ui/main.qml @@ -193,27 +193,16 @@ return 1; } - var rows=1; - - ///pagerLayout value supports 0-Default, 1-Horizontal, 2-Vertical - if(isActivityPager && plasmoid.configuration.pagerLayout !== 0) { - if (plasmoid.configuration.pagerLayout === 1){ - rows =1; - } else if(plasmoid.configuration.pagerLayout === 2){ - rows = pagerModel.count; - } - } else { - var columns = Math.floor(pagerModel.count / pagerModel.layoutRows); + var columns = Math.floor(pagerModel.count / pagerModel.layoutRows); - if (pagerModel.count % pagerModel.layoutRows > 0) { - columns += 1; - } + if (pagerModel.count % pagerModel.layoutRows > 0) { + columns += 1; + } - rows = Math.floor(pagerModel.count / columns); + var rows = Math.floor(pagerModel.count / columns); - if (pagerModel.count % columns > 0) { - rows += 1; - } + if (pagerModel.count % columns > 0) { + rows += 1; } return rows;