Skip to content

Commit

Permalink
some icons :o
Browse files Browse the repository at this point in the history
  • Loading branch information
@benapetr
benapetr committed Jan 7, 2014
1 parent 425d116 commit 6bc47de
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 37 deletions.
44 changes: 26 additions & 18 deletions huggle/core.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,23 @@ void Core::Shutdown()
QApplication::quit();
}

bool Core::IsRevert(QString Summary)
{
if (Summary != "")
{
int xx = 0;
while (xx < Configuration::HuggleConfiguration->RevertPatterns.count())
{
if (Summary.contains(Configuration::HuggleConfiguration->RevertPatterns.at(xx)))
{
return true;
}
xx++;
}
}
return false;
}

void Core::DeveloperError()
{
QMessageBox *mb = new QMessageBox();
Expand Down Expand Up @@ -593,26 +610,17 @@ void Core::PreProcessEdit(WikiEdit *_e)
x++;
}

if (_e->Summary != "")
if (this->IsRevert(_e->Summary))
{
int xx = 0;
while (xx < Configuration::HuggleConfiguration->RevertPatterns.count())
_e->IsRevert = true;
if (this->PrimaryFeedProvider != NULL)
{
if (_e->Summary.contains(Configuration::HuggleConfiguration->RevertPatterns.at(xx)))
{
_e->IsRevert = true;
if (this->PrimaryFeedProvider != NULL)
{
this->PrimaryFeedProvider->RvCounter++;
}
if (Configuration::HuggleConfiguration->UserConfig_DeleteEditsAfterRevert)
{
_e->RegisterConsumer("UncheckedReverts");
this->UncheckedReverts.append(_e);
}
break;
}
xx++;
this->PrimaryFeedProvider->RvCounter++;
}
if (Configuration::HuggleConfiguration->UserConfig_DeleteEditsAfterRevert)
{
_e->RegisterConsumer("UncheckedReverts");
this->UncheckedReverts.append(_e);
}
}

Expand Down
1 change: 1 addition & 0 deletions huggle/core.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ namespace Huggle
void ProcessEdit(WikiEdit *e);
//! Terminate the process, call this after you release all resources and finish all queries
void Shutdown();
bool IsRevert(QString Summary);
//! Display a message box telling user that function is not allowed during developer mode
void DeveloperError();
//! Check the edit summary and similar in order to
Expand Down
45 changes: 32 additions & 13 deletions huggle/historyform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ HistoryForm::HistoryForm(QWidget *parent) : QDockWidget(parent), ui(new Ui::Hist
this->ui->setupUi(this);
this->ui->pushButton->setEnabled(false);
this->ui->pushButton->setText(Localizations::HuggleLocalizations->Localize("historyform-no-info"));
this->ui->tableWidget->setColumnCount(5);
this->ui->tableWidget->setColumnCount(6);
QStringList header;
header << Huggle::Localizations::HuggleLocalizations->Localize("user") <<
header << "" << Huggle::Localizations::HuggleLocalizations->Localize("user") <<
Huggle::Localizations::HuggleLocalizations->Localize("size") <<
Huggle::Localizations::HuggleLocalizations->Localize("summary") <<
Huggle::Localizations::HuggleLocalizations->Localize("id") <<
Expand Down Expand Up @@ -191,47 +191,66 @@ void HistoryForm::onTick01()
}
}
this->ui->tableWidget->insertRow(x);
QIcon icon(":/huggle/pictures/Resources/blob-none.png");

if (Core::HuggleCore->IsRevert(summary))
{
icon = QIcon(":/huggle/pictures/Resources/blob-revert.png");
} else if (WikiUser::IsIPv6(user) || WikiUser::IsIPv4(user))
{
icon = QIcon(":/huggle/pictures/Resources/blob-anon.png");
} else if (Configuration::HuggleConfiguration->WhiteList.contains(user))
{
icon = QIcon(":/huggle/pictures/Resources/blob-ignored.png");
}

if (this->CurrentEdit->RevID == RevID.toInt())
{
QFont font;
font.setBold(true);
QTableWidgetItem *i = new QTableWidgetItem(user);
i->setFont(font);
QTableWidgetItem *i = new QTableWidgetItem(icon, "");
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 0, i);
i = new QTableWidgetItem(size);
i = new QTableWidgetItem(user);
i->setFont(font);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 1, i);
i = new QTableWidgetItem(summary);
i = new QTableWidgetItem(size);
i->setFont(font);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 2, i);
i = new QTableWidgetItem(RevID);
i = new QTableWidgetItem(summary);
i->setFont(font);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 3, i);
i = new QTableWidgetItem(date);
i = new QTableWidgetItem(RevID);
i->setFont(font);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 4, i);
i = new QTableWidgetItem(date);
i->setFont(font);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 5, i);
} else
{
QTableWidgetItem *i = new QTableWidgetItem(user);
QTableWidgetItem *i = new QTableWidgetItem(icon, "");
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 0, i);
i = new QTableWidgetItem(size);
i = new QTableWidgetItem(user);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 1, i);
i = new QTableWidgetItem(summary);
i = new QTableWidgetItem(size);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 2, i);
i = new QTableWidgetItem(RevID);
i = new QTableWidgetItem(summary);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 3, i);
i = new QTableWidgetItem(date);
i = new QTableWidgetItem(RevID);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 4, i);
i = new QTableWidgetItem(date);
i->setBackgroundColor(xb);
this->ui->tableWidget->setItem(x, 5, i);
}
x++;
}
Expand Down
21 changes: 15 additions & 6 deletions huggle/wikiuser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ void WikiUser::UpdateUser(WikiUser *us)
WikiUser::ProblematicUserListLock.unlock();
}

bool WikiUser::IsIPv4(QString user)
{
return WikiUser::IPv4Regex.exactMatch(user);
}

bool WikiUser::IsIPv6(QString user)
{
return WikiUser::IPv6Regex.exactMatch(user);
}

WikiUser::WikiUser()
{
this->UserLock = new QMutex(QMutex::Recursive);
Expand Down Expand Up @@ -135,13 +145,12 @@ WikiUser::WikiUser(QString user)
this->IP = false;
if (user != "")
{
this->IP = WikiUser::IPv6Regex.exactMatch(user);
if (!this->IP)
if (WikiUser::IPv6Regex.exactMatch(user))
{
if (WikiUser::IPv4Regex.exactMatch(user))
{
this->IP = true;
}
this->IP = true;
} else if (WikiUser::IPv4Regex.exactMatch(user))
{
this->IP = true;
}
}
this->Username = user;
Expand Down
2 changes: 2 additions & 0 deletions huggle/wikiuser.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ namespace Huggle
static void TrimProblematicUsersList();
//! Update a list of problematic users
static void UpdateUser(WikiUser *us);
static bool IsIPv4(QString user);
static bool IsIPv6(QString user);
/*!
* \brief Function that return static version of this user
*
Expand Down

0 comments on commit 6bc47de

Please sign in to comment.