mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
Compare commits
2 commits
70342cd44c
...
081cba6b23
Author | SHA1 | Date | |
---|---|---|---|
081cba6b23 | |||
f6434f4219 |
|
@ -111,7 +111,7 @@ HotKey::HotKey( QKeySequence const & seq ):
|
||||||
|
|
||||||
QKeySequence HotKey::toKeySequence() const
|
QKeySequence HotKey::toKeySequence() const
|
||||||
{
|
{
|
||||||
if ( key2 != 0 || key2 != Qt::Key::Key_unknown ) {
|
if ( key2 != 0 && key2 != Qt::Key::Key_unknown ) {
|
||||||
return { QKeyCombination( modifiers, static_cast< Qt::Key >( key1 ) ),
|
return { QKeyCombination( modifiers, static_cast< Qt::Key >( key1 ) ),
|
||||||
QKeyCombination( modifiers, static_cast< Qt::Key >( key2 ) ) };
|
QKeyCombination( modifiers, static_cast< Qt::Key >( key2 ) ) };
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,9 +53,8 @@ Group::Group( Config::Group const & cfgGroup,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Group::Group( QString name_ ):
|
Group::Group():
|
||||||
id( 0 ),
|
id( 0 )
|
||||||
name( std::move( name_ ) )
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ struct Group
|
||||||
Config::Group const & inactiveGroup );
|
Config::Group const & inactiveGroup );
|
||||||
|
|
||||||
/// Creates an empty group.
|
/// Creates an empty group.
|
||||||
explicit Group( QString name_ );
|
explicit Group();
|
||||||
|
|
||||||
Group( unsigned id, QString name_ );
|
Group( unsigned id, QString name_ );
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ void DictGroupWidget::groupIconActivated( int index )
|
||||||
|
|
||||||
Config::Group DictGroupWidget::makeGroup() const
|
Config::Group DictGroupWidget::makeGroup() const
|
||||||
{
|
{
|
||||||
Instances::Group g( "" );
|
Instances::Group g;
|
||||||
|
|
||||||
g.id = groupId;
|
g.id = groupId;
|
||||||
|
|
||||||
|
|
|
@ -135,7 +135,7 @@ OrderAndProps::OrderAndProps( QWidget * parent,
|
||||||
|
|
||||||
Config::Group OrderAndProps::getCurrentDictionaryOrder() const
|
Config::Group OrderAndProps::getCurrentDictionaryOrder() const
|
||||||
{
|
{
|
||||||
Instances::Group g( "" );
|
Instances::Group g;
|
||||||
|
|
||||||
g.dictionaries = ui.dictionaryOrder->getCurrentDictionaries();
|
g.dictionaries = ui.dictionaryOrder->getCurrentDictionaries();
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ Config::Group OrderAndProps::getCurrentDictionaryOrder() const
|
||||||
|
|
||||||
Config::Group OrderAndProps::getCurrentInactiveDictionaries() const
|
Config::Group OrderAndProps::getCurrentInactiveDictionaries() const
|
||||||
{
|
{
|
||||||
Instances::Group g( "" );
|
Instances::Group g;
|
||||||
|
|
||||||
g.dictionaries = ui.inactiveDictionaries->getCurrentDictionaries();
|
g.dictionaries = ui.inactiveDictionaries->getCurrentDictionaries();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue