From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 19 Jan 2018 14:42:01 +0100 Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to iconName (issue with Qt 5.10 and new icon property) --- ui/modules/Common/Form/Tab/TabButton.qml | 8 ++++---- ui/views/App/Settings/SettingsWindow.qml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml index ad220ab2..a47bb20b 100644 --- a/ui/modules/Common/Form/Tab/TabButton.qml +++ b/ui/modules/Common/Form/Tab/TabButton.qml @@ -12,8 +12,8 @@ Controls.TabButton { // --------------------------------------------------------------------------- - property string icon property int iconSize: TabButtonStyle.icon.size + property string iconName readonly property bool _isSelected: parent.parent.currentItem === button @@ -66,9 +66,9 @@ Controls.TabButton { Layout.leftMargin: TabButtonStyle.text.leftPadding icon: { - var icon = button.icon - return icon.length - ? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) + var iconName = button.iconName + return iconName.length + ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) : '' } iconSize: button.iconSize diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml index b8f5a80f..58909544 100644 --- a/ui/views/App/Settings/SettingsWindow.qml +++ b/ui/views/App/Settings/SettingsWindow.qml @@ -48,43 +48,43 @@ ApplicationWindow { id: tabBar TabButton { - icon: 'settings_sip_accounts' + iconName: 'settings_sip_accounts' text: qsTr('sipAccountsTab') width: implicitWidth } TabButton { - icon: 'settings_audio' + iconName: 'settings_audio' text: qsTr('audioTab') width: implicitWidth } TabButton { - icon: 'settings_video' + iconName: 'settings_video' text: qsTr('videoTab') width: implicitWidth } TabButton { - icon: 'settings_call' + iconName: 'settings_call' text: qsTr('callsAndChatTab') width: implicitWidth } TabButton { - icon: 'settings_network' + iconName: 'settings_network' text: qsTr('networkTab') width: implicitWidth } TabButton { - icon: 'settings_advanced' + iconName: 'settings_advanced' text: qsTr('uiTab') width: implicitWidth } TabButton { - icon: 'settings_advanced' + iconName: 'settings_advanced' text: qsTr('uiAdvanced') width: implicitWidth } -- 2.21.0 ve Nix importer....This importer has suffered from bitrot and no longer works with current Nix and Nixpkgs. See <https://bugs.gnu.org/32339> and <https://bugs.gnu.org/36255>. * guix/import/snix.scm, guix/scripts/import/nix.scm, tests/snix.scm: Remove. * Makefile.am (MODULES, SCM_TESTS): Remove them. * guix/scripts/import.scm (importers): Remove "nix". * build-aux/test-env.in: Remove NIXPKGS variable. * configure.ac: Remove '--with-nixpkgs' option. * doc/guix.texi (Invoking guix import): Remove bit about "guix import nix". * etc/completion/fish/guix.fish: Likewise. Ludovic Courtès 2021-02-17scripts: system: Remove 'vm-image' command....Remove the 'vm-image' command that has been superseded by the 'image' command. * gnu/system/vm.scm (system-qemu-image): Remove it. * guix/scripts/system.scm (system-derivation-for-action): Mark 'vm-image' command as deprecated and use the image API to produce the VM image. (perform-action, show-help): Adapt accordingly. * tests/guix-system.sh: Ditto. * doc/guix.texi (Invoking guix system, Running Guix in a VM): Ditto. * etc/completion/fish/guix.fish: Ditto. * etc/completion/zsh/_guix: Ditto. Mathieu Othacehe 2020-05-13mailmap: Update entries for Nikita....* .mailmap: change email and name for Nikita. * Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish, gnu/packages/accessibility.scm, gnu/packages/admin.scm, gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/cinnamon.scm, gnu/packages/compression.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/enlightenment.scm, gnu/packages/erlang.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm, gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm, gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm, gnu/packages/haskell.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm, gnu/packages/libcanberra.scm, gnu/packages/linux.scm, gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm, gnu/packages/ncurses.scm, gnu/packages/networking.scm, gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm, gnu/packages/telephony.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm, gnu/services/desktop.scm, gnu/services/version-control.scm, gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> nikita