hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

fix: remove some tabText() in groupWidget rename group

Browse source
This commit is contained in:
xiaoyifang 2024-11-04 10:05:38 +08:00 committed by xiaoyifang
parent 3f6819b049
commit 4f19efcdb7
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ui/groups_widgets.cc
View file

@ -29,7 +29,8 @@ DictGroupWidget::DictGroupWidget( QWidget * parent,
vector< sptr< Dictionary::Class > > const & dicts, vector< sptr< Dictionary::Class > > const & dicts,
Config::Group const & group ): Config::Group const & group ):
QWidget( parent ), QWidget( parent ),
groupId( group.id ) groupId( group.id ),
groupName( group.name )
{ {
ui.setupUi( this ); ui.setupUi( this );
ui.dictionaries->populate( Instances::Group( group, dicts, Config::Group() ).dictionaries, dicts ); ui.dictionaries->populate( Instances::Group( group, dicts, Config::Group() ).dictionaries, dicts );
@ -139,6 +140,7 @@ Config::Group DictGroupWidget::makeGroup() const
g.favoritesFolder = ui.favoritesFolder->text().replace( '\\', '/' ); g.favoritesFolder = ui.favoritesFolder->text().replace( '\\', '/' );
g.name = groupName;
return g.makeConfigGroup(); return g.makeConfigGroup();
} }
@ -558,8 +560,7 @@ void DictGroupsWidget::populate( Config::Groups const & groups,
connect( gr, &DictGroupWidget::showDictionaryInfo, this, &DictGroupsWidget::showDictionaryInfo ); connect( gr, &DictGroupWidget::showDictionaryInfo, this, &DictGroupsWidget::showDictionaryInfo );
connect( gr->getModel(), &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged ); connect( gr->getModel(), &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
QString toolTipStr = QString toolTipStr = tr( "Dictionaries: " ) + QString::number( getDictionaryCountAt( x ) );
"\"" + tabText( x ) + "\"\n" + tr( "Dictionaries: " ) + QString::number( getDictionaryCountAt( x ) );
setTabToolTip( x, toolTipStr ); setTabToolTip( x, toolTipStr );
} }
@ -577,7 +578,6 @@ Config::Groups DictGroupsWidget::makeGroups() const
for ( int x = 0; x < count(); ++x ) { for ( int x = 0; x < count(); ++x ) {
result.push_back( dynamic_cast< DictGroupWidget & >( *widget( x ) ).makeGroup() ); result.push_back( dynamic_cast< DictGroupWidget & >( *widget( x ) ).makeGroup() );
result.back().name = Utils::unescapeAmps( tabText( x ) );
} }
return result; return result;
@ -655,8 +655,7 @@ int DictGroupsWidget::addNewGroup( QString const & name )
connect( gr->getModel(), &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged ); connect( gr->getModel(), &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
const QString toolTipStr = const QString toolTipStr = tr( "Dictionaries: " ) + QString::number( getDictionaryCountAt( idx ) );
"\"" + tabText( idx ) + "\"\n" + tr( "Dictionaries: " ) + QString::number( getDictionaryCountAt( idx ) );
setTabToolTip( idx, toolTipStr ); setTabToolTip( idx, toolTipStr );
return idx; return idx;
} }
@ -916,7 +915,9 @@ QString DictGroupsWidget::getCurrentGroupName() const
const int current = currentIndex(); const int current = currentIndex();
if ( current >= 0 ) { if ( current >= 0 ) {
return Utils::unescapeAmps( tabText( current ) ); auto widget = dynamic_cast< DictGroupWidget & >( *widget( x ) );
return widget.name();
} }
return {}; return {};
@ -927,6 +928,8 @@ void DictGroupsWidget::renameCurrentGroup( QString const & name )
const int current = currentIndex(); const int current = currentIndex();
if ( current >= 0 ) { if ( current >= 0 ) {
auto widget = dynamic_cast< DictGroupWidget & >( *widget( x ) );
widget->setName( name );
setTabText( current, Utils::escapeAmps( name ) ); setTabText( current, Utils::escapeAmps( name ) );
} }
} }
@ -971,7 +974,7 @@ void DictGroupsWidget::combineGroups( int source, int target )
connect( model, &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged ); connect( model, &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
const QString toolTipStr = "\"" + tabText( target ) + "\"\n" + tr( "Dictionaries: " ) const QString toolTipStr = tr( "Dictionaries: " )
+ QString::number( model->getCurrentDictionaries().size() ); + QString::number( model->getCurrentDictionaries().size() );
setTabToolTip( target, toolTipStr ); setTabToolTip( target, toolTipStr );
} }
@ -1124,7 +1127,7 @@ void DictGroupsWidget::contextMenu( QPoint const & pos )
void DictGroupsWidget::tabDataChanged() void DictGroupsWidget::tabDataChanged()
{ {
const QString toolTipStr = "\"" + tabText( currentIndex() ) + "\"\n" + tr( "Dictionaries: " ) const QString toolTipStr = tr( "Dictionaries: " )
+ QString::number( getCurrentModel()->getCurrentDictionaries().size() ); + QString::number( getCurrentModel()->getCurrentDictionaries().size() );
setTabToolTip( currentIndex(), toolTipStr ); setTabToolTip( currentIndex(), toolTipStr );
} }

9
src/ui/groups_widgets.hh
View file

@ -136,6 +136,14 @@ public:
return ui.dictionaries->selectionModel(); return ui.dictionaries->selectionModel();
} }
QString name(){
return groupName;
}
void setName( const QString & name ){
groupName = name;
}
private slots: private slots:
void groupIconActivated( int ); void groupIconActivated( int );
@ -145,6 +153,7 @@ private slots:
private: private:
Ui::DictGroupWidget ui; Ui::DictGroupWidget ui;
unsigned groupId; unsigned groupId;
QString groupName;
signals: signals:
void showDictionaryInfo( QString const & id ); void showDictionaryInfo( QString const & id );