0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1313 remove translatable strings from MCModInfoFrame

Browse Source
This commit is contained in:
Petr Mrázek
2016-01-02 04:01:00 +01:00
parent da2af5e449
commit b9b5a82c2e
3 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
application/widgets/MCModInfoFrame.cpp
View File

@@ -46,7 +46,7 @@ void MCModInfoFrame::updateWithMod(Mod &m)
if (m.description().isEmpty())
{
setModDescription(tr("No description provided in mcmod.info"));
setModDescription(QString());
}
else
{
@@ -56,8 +56,8 @@ void MCModInfoFrame::updateWithMod(Mod &m)
void MCModInfoFrame::clear()
{
setModText(tr("Select a mod to view title and authors..."));
setModDescription(tr("Select a mod to view description..."));
setModText(QString());
setModDescription(QString());
}
MCModInfoFrame::MCModInfoFrame(QWidget *parent) :
@@ -65,6 +65,9 @@ MCModInfoFrame::MCModInfoFrame(QWidget *parent) :
ui(new Ui::MCModInfoFrame)
{
ui->setupUi(this);
ui->label_ModDescription->setHidden(true);
ui->label_ModText->setHidden(true);
updateHiddenState();
}
MCModInfoFrame::~MCModInfoFrame()
@@ -72,13 +75,45 @@ MCModInfoFrame::~MCModInfoFrame()
delete ui;
}
void MCModInfoFrame::updateHiddenState()
{
if(ui->label_ModDescription->isHidden() && ui->label_ModText->isHidden())
{
setHidden(true);
}
else
{
setHidden(false);
}
}
void MCModInfoFrame::setModText(QString text)
{
ui->label_ModText->setText(text);
if(text.isEmpty())
{
ui->label_ModText->setHidden(true);
}
else
{
ui->label_ModText->setText(text);
ui->label_ModText->setHidden(false);
}
updateHiddenState();
}
void MCModInfoFrame::setModDescription(QString text)
{
if(text.isEmpty())
{
ui->label_ModDescription->setHidden(true);
updateHiddenState();
return;
}
else
{
ui->label_ModDescription->setHidden(false);
updateHiddenState();
}
ui->label_ModDescription->setToolTip("");
QString intermediatetext = text.trimmed();
bool prev(false);
@@ -115,7 +150,7 @@ void MCModInfoFrame::modDescEllipsisHandler(const QString &link)
{
if(!currentBox)
{
currentBox = CustomMessageBox::selectable(this, tr(""), desc);
currentBox = CustomMessageBox::selectable(this, QString(), desc);
connect(currentBox, &QMessageBox::finished, this, &MCModInfoFrame::boxClosed);
currentBox->show();
}

3
application/widgets/MCModInfoFrame.h
View File

@@ -41,6 +41,9 @@ public slots:
void modDescEllipsisHandler(const QString& link );
void boxClosed(int result);
private:
void updateHiddenState();
private:
Ui::MCModInfoFrame *ui;
QString desc;

27
application/widgets/MCModInfoFrame.ui
View File

@@ -26,10 +26,25 @@
<string>Frame</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_ModText">
<property name="text">
<string>Select a mod to view title and authors...</string>
<string notr="true"/>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
@@ -50,11 +65,14 @@
</item>
<item>
<widget class="QLabel" name="label_ModDescription">
<property name="toolTip">
<string notr="true"/>
</property>
<property name="text">
<string>Select a mod to view description...</string>
<string notr="true"/>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -62,6 +80,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>