ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: use wstring in symbol and bookmark names

Browse Source 
* use wstring in symbol and bookmark names
* fixed setting apppath in windows includes
* regard utf8 encoding in shared indexer commands
* regard utf8 encoding in shared indexer status
This commit is contained in:
mlangkabel
2018-02-05 17:17:33 +01:00
parent c99e79364f
commit 9e041c1f0a
155 changed files with 1955 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtBookmark.cpp
+8 -8
View File
@@ -12,7 +12,7 @@
QtBookmark::QtBookmark(ControllerProxy<BookmarkController>* controllerProxy)
: m_controllerProxy(controllerProxy)
, m_treeWidgetItem(NULL)
, m_arrowImageName("arrow_line_down.png")
, m_arrowImageName(L"arrow_line_down.png")
, m_hovered(false)
, m_ignoreNextResize(false)
{
@@ -94,7 +94,7 @@ void QtBookmark::setBookmark(const std::shared_ptr<Bookmark> bookmark)
{
m_bookmark = bookmark;
m_activateButton->setText(m_bookmark->getName().c_str());
m_activateButton->setText(QString::fromStdWString(m_bookmark->getName()));
if (m_bookmark->isValid() == false)
{
@@ -104,7 +104,7 @@ void QtBookmark::setBookmark(const std::shared_ptr<Bookmark> bookmark)
if (m_bookmark->getComment().length() > 0)
{
m_comment->setText(m_bookmark->getComment().c_str());
m_comment->setText(QString::fromStdWString(m_bookmark->getComment()));
m_toggleCommentButton->show();
}
else
@@ -142,13 +142,13 @@ void QtBookmark::commentToggled()
if (m_comment->isVisible() == false)
{
m_arrowImageName = "arrow_line_up.png";
m_arrowImageName = L"arrow_line_up.png";
m_comment->show();
m_comment->setMinimumHeight(m_comment->heightForWidth(m_comment->width()));
}
else
{
m_arrowImageName = "arrow_line_down.png";
m_arrowImageName = L"arrow_line_down.png";
m_comment->hide();
}
@@ -170,7 +170,7 @@ void QtBookmark::resizeEvent(QResizeEvent* event)
return;
}
m_activateButton->setText(m_bookmark->getName().c_str());
m_activateButton->setText(QString::fromStdWString(m_bookmark->getName()));
QTimer::singleShot(10, this, &QtBookmark::elideButtonText);
}
@@ -226,12 +226,12 @@ void QtBookmark::deleteClicked()
void QtBookmark::elideButtonText()
{
m_activateButton->setText(m_activateButton->fontMetrics().elidedText(
m_bookmark->getName().c_str(), Qt::ElideMiddle, m_activateButton->width() - 16));
QString::fromStdWString(m_bookmark->getName()), Qt::ElideMiddle, m_activateButton->width() - 16));
}
void QtBookmark::updateArrow()
{
QPixmap pixmap((ResourcePaths::getGuiPath().str() + "bookmark_view/images/" + m_arrowImageName).c_str());
QPixmap pixmap(QString::fromStdWString(ResourcePaths::getGuiPath().concatenate(L"bookmark_view/images/" + m_arrowImageName).wstr()));
m_toggleCommentButton->setIcon(QIcon(utility::colorizePixmap(pixmap, m_hovered ? "#707070" : "black")));
}