fix #47
This commit is contained in:
parent
12f6b1e8c9
commit
7fa6989f38
@ -17,6 +17,8 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from anki.utils import isMac
|
||||||
from aqt.qt import *
|
from aqt.qt import *
|
||||||
from ..context import APP_ICON
|
from ..context import APP_ICON
|
||||||
|
|
||||||
@ -49,6 +51,9 @@ class Dialog(QDialog):
|
|||||||
title if "FastWQ" in title
|
title if "FastWQ" in title
|
||||||
else "FastWQ - " + title
|
else "FastWQ - " + title
|
||||||
)
|
)
|
||||||
|
# 2 & 3 & mac compatible
|
||||||
|
if isMac and sys.hexversion >= 0x03000000:
|
||||||
|
QApplication.setStyle('Fusion')
|
||||||
|
|
||||||
|
|
||||||
class WidgetSize(object):
|
class WidgetSize(object):
|
||||||
@ -56,7 +61,7 @@ class WidgetSize(object):
|
|||||||
constant values
|
constant values
|
||||||
'''
|
'''
|
||||||
dialog_width = 850
|
dialog_width = 850
|
||||||
dialog_height_margin = 146
|
dialog_height_margin = 166 if isMac and sys.hexversion < 0x03000000 else 146
|
||||||
map_min_height = 0
|
map_min_height = 0
|
||||||
map_max_height = 30
|
map_max_height = 30
|
||||||
map_fld_width = 100
|
map_fld_width = 100
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import sys
|
||||||
import anki
|
import anki
|
||||||
import aqt
|
import aqt
|
||||||
import aqt.models
|
import aqt.models
|
||||||
@ -138,7 +139,7 @@ class OptionsDialog(Dialog):
|
|||||||
tab_add_button = QToolButton(self)
|
tab_add_button = QToolButton(self)
|
||||||
tab_add_button.setIcon(get_icon('add.png'))
|
tab_add_button.setIcon(get_icon('add.png'))
|
||||||
tab_set_button = QToolButton(self)
|
tab_set_button = QToolButton(self)
|
||||||
if isMac:
|
if isMac and sys.hexversion < 0x03000000:
|
||||||
tab_set_button.setMaximumSize(20, 20)
|
tab_set_button.setMaximumSize(20, 20)
|
||||||
tab_add_button.setMaximumSize(20, 20)
|
tab_add_button.setMaximumSize(20, 20)
|
||||||
tab_set_button.setIcon(get_icon('setting.png'))
|
tab_set_button.setIcon(get_icon('setting.png'))
|
||||||
@ -266,7 +267,7 @@ class OptionsDialog(Dialog):
|
|||||||
self.tab_widget.setTabText(k, _('CONFIG_INDEX') % (k+1))
|
self.tab_widget.setTabText(k, _('CONFIG_INDEX') % (k+1))
|
||||||
|
|
||||||
def changedTab(self, i):
|
def changedTab(self, i):
|
||||||
if not isMac:
|
if not isMac or sys.hexversion >= 0x03000000:
|
||||||
# restore
|
# restore
|
||||||
for k in range(0, len(self.tabs)):
|
for k in range(0, len(self.tabs)):
|
||||||
self.tab_widget.setTabIcon(k, self._NULL_ICON)
|
self.tab_widget.setTabIcon(k, self._NULL_ICON)
|
||||||
|
|||||||
@ -17,6 +17,8 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from anki.utils import isMac
|
||||||
from aqt.qt import *
|
from aqt.qt import *
|
||||||
from ..context import APP_ICON
|
from ..context import APP_ICON
|
||||||
|
|
||||||
@ -49,6 +51,9 @@ class Dialog(QDialog):
|
|||||||
title if "FastWQ" in title
|
title if "FastWQ" in title
|
||||||
else "FastWQ - " + title
|
else "FastWQ - " + title
|
||||||
)
|
)
|
||||||
|
# 2 & 3 & mac compatible
|
||||||
|
if isMac and sys.hexversion >= 0x03000000:
|
||||||
|
QApplication.setStyle('Fusion')
|
||||||
|
|
||||||
|
|
||||||
class WidgetSize(object):
|
class WidgetSize(object):
|
||||||
@ -56,7 +61,7 @@ class WidgetSize(object):
|
|||||||
constant values
|
constant values
|
||||||
'''
|
'''
|
||||||
dialog_width = 850
|
dialog_width = 850
|
||||||
dialog_height_margin = 146
|
dialog_height_margin = 166 if isMac and sys.hexversion < 0x03000000 else 146
|
||||||
map_min_height = 0
|
map_min_height = 0
|
||||||
map_max_height = 30
|
map_max_height = 30
|
||||||
map_fld_width = 100
|
map_fld_width = 100
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import sys
|
||||||
import anki
|
import anki
|
||||||
import aqt
|
import aqt
|
||||||
import aqt.models
|
import aqt.models
|
||||||
@ -138,7 +139,7 @@ class OptionsDialog(Dialog):
|
|||||||
tab_add_button = QToolButton(self)
|
tab_add_button = QToolButton(self)
|
||||||
tab_add_button.setIcon(get_icon('add.png'))
|
tab_add_button.setIcon(get_icon('add.png'))
|
||||||
tab_set_button = QToolButton(self)
|
tab_set_button = QToolButton(self)
|
||||||
if isMac:
|
if isMac and sys.hexversion < 0x03000000:
|
||||||
tab_set_button.setMaximumSize(20, 20)
|
tab_set_button.setMaximumSize(20, 20)
|
||||||
tab_add_button.setMaximumSize(20, 20)
|
tab_add_button.setMaximumSize(20, 20)
|
||||||
tab_set_button.setIcon(get_icon('setting.png'))
|
tab_set_button.setIcon(get_icon('setting.png'))
|
||||||
@ -266,7 +267,7 @@ class OptionsDialog(Dialog):
|
|||||||
self.tab_widget.setTabText(k, _('CONFIG_INDEX') % (k+1))
|
self.tab_widget.setTabText(k, _('CONFIG_INDEX') % (k+1))
|
||||||
|
|
||||||
def changedTab(self, i):
|
def changedTab(self, i):
|
||||||
if not isMac:
|
if not isMac or sys.hexversion >= 0x03000000:
|
||||||
# restore
|
# restore
|
||||||
for k in range(0, len(self.tabs)):
|
for k in range(0, len(self.tabs)):
|
||||||
self.tab_widget.setTabIcon(k, self._NULL_ICON)
|
self.tab_widget.setTabIcon(k, self._NULL_ICON)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user