Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opt:favorite icon adjustment,allow more situation #2178

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 127 additions & 0 deletions icons/star_blue_other.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
167 changes: 167 additions & 0 deletions icons/star_other.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
<file>icons/sources.png</file>
<file>icons/star.svg</file>
<file>icons/star_blue.svg</file>
<file>icons/star_other.svg</file>
<file>icons/star_blue_other.svg</file>
<file>icons/system-search.svg</file>
<file>icons/windows-list.svg</file>
<file>icons/wizard.svg</file>
Expand Down
3 changes: 2 additions & 1 deletion src/common/globalbroadcaster.hh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public:
QString translateLineText{};
//hold the dictionary id;
QSet< QString > collapsedDicts;
QMap< QString, QSet< QString > > folderFavoritesMap;
//key hold the headword, value holds the folders.
QMap< QString, QSet< QString > > wordFavoriteFolderMap;
QMap< unsigned, QString > groupFolderMap;
PronounceEngine pronounce_engine;
QString getAbbrName( QString const & text );
Expand Down
28 changes: 28 additions & 0 deletions src/ui/favoritemanager.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// Created by xiaoyifang on 2025/2/21.
//

#include "favoritemanager.hh"
#include "globalbroadcaster.hh"
FavoriteType FavoriteManager::determineFavoriteType( const QString & word, unsigned groupId )
{
QString folder = GlobalBroadcaster::instance()->groupFolderMap[ groupId ];
return determineFavoriteType( word, folder );
}

FavoriteType FavoriteManager::determineFavoriteType( const QString & word, const QString & folder )
{
if ( !GlobalBroadcaster::instance()->wordFavoriteFolderMap.contains( word ) ) {
return FavoriteType::EMPTY;
}

if ( GlobalBroadcaster::instance()->wordFavoriteFolderMap[ word ].contains( folder ) ) {
if ( GlobalBroadcaster::instance()->wordFavoriteFolderMap[ word ].size() == 1 ) {
return FavoriteType::FULL;
}
else {
return FavoriteType::FULL_OTHER;
}
}
return FavoriteType::EMPTY_OTHER;
}
21 changes: 21 additions & 0 deletions src/ui/favoritemanager.hh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* This file is (c) 2025 gd-ng community
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */

#pragma once

#include <QString>
enum class FavoriteType {
EMPTY,
//current group is empty while other group is not empty
EMPTY_OTHER,
FULL,
FULL_OTHER
};

class FavoriteManager
{

public:
static FavoriteType determineFavoriteType( QString const & word, unsigned group );
static FavoriteType determineFavoriteType( const QString & word, const QString & folder );
};
6 changes: 3 additions & 3 deletions src/ui/favoritespanewidget.cc
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,12 @@ void FavoritesPaneWidget::clearAllItems()
void FavoritesPaneWidget::addHeadword( QString const & path, QString const & headword )
{
m_favoritesModel->addNewHeadword( path, headword );
GlobalBroadcaster::instance()->folderFavoritesMap[ path ].insert( headword );
GlobalBroadcaster::instance()->wordFavoriteFolderMap[ headword ].insert( path );
}

bool FavoritesPaneWidget::removeHeadword( QString const & path, QString const & headword )
{
GlobalBroadcaster::instance()->folderFavoritesMap[ path ].remove( headword );
GlobalBroadcaster::instance()->wordFavoriteFolderMap[ headword ].remove( path );

return m_favoritesModel->removeHeadword( path, headword );
}
Expand Down Expand Up @@ -761,7 +761,7 @@ void FavoritesModel::addFolder( TreeItem * parent, QDomNode & node )
}
parent->appendChild( new TreeItem( word, parent, TreeItem::Word ) );

GlobalBroadcaster::instance()->folderFavoritesMap[ parent->data().toString() ].insert( word );
GlobalBroadcaster::instance()->wordFavoriteFolderMap[ word ].insert( parent->data().toString() );
}
}
dirty = true;
Expand Down
Loading
Loading