Skip to content
This repository has been archived by the owner on Aug 26, 2020. It is now read-only.

Commit

Permalink
Minor color change.
Browse files Browse the repository at this point in the history
  • Loading branch information
3vi1 committed May 6, 2017
1 parent 3432ff6 commit e364822
Show file tree
Hide file tree
Showing 8 changed files with 175 additions and 100 deletions.
2 changes: 1 addition & 1 deletion data/styles/Ore
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ MsgStyle
qproperty-shipColor: DarkOrange;
qproperty-stampColor: white;
qproperty-statusColor: DarkCyan;
qproperty-systemColor: #A0A0FF;
qproperty-systemColor: #2020EF;
qproperty-warnColor: #FF0000;
}

Expand Down
1 change: 1 addition & 0 deletions docs/FAQ
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ A: The controls so far (make sure you have clicked app window to give it focus
W: Toggle on/off title bar
M: Toggle on/off menu bar
T: Toggle on/off Always on Top.
L: Toggle on/off Message List.

There's no feature to set your current system at the moment, but I haven't needed it
since Imp deduces your location on startup without needing to jump.
Expand Down
7 changes: 7 additions & 0 deletions docs/RELEASES
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
0.8.5 - Modified message list to be a dockable widget. You can now move it
to any side of the window, or detach it to be it's own floating
window.

Added a couple of additional test styles: Blood Raider, Ore, and
Entellag.

0.8.4 - Added skin/styles support. This adds a new UI tab to the settings
dialog where you can select the style. You can add your own styles
by placing them in the /styles subdirectory. Take a look at
Expand Down
2 changes: 1 addition & 1 deletion src/imp.pro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = imp
TEMPLATE = app

VERSION = 0.8.4
VERSION = 0.8.5
QMAKE_TARGET_COMPANY = EternalDusk
QMAKE_TARGET_DESCRIPTION = Eve Online Intelligence Management Program
QMAKE_TARGET_COPYRIGHT = (c) Copyright 2016-2017 Jesse Litton
Expand Down
46 changes: 39 additions & 7 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ MainWindow::MainWindow(QWidget *parent) :
menuShortcut = new QShortcut(QKeySequence(Qt::Key_M), this, SLOT(on_action_Menu_Toggle_triggered()));
overlayShortcut = new QShortcut(QKeySequence(Qt::Key_O), this, SLOT(on_action_Overlay_Mode_triggered()));
alwaysOnTopShortcut = new QShortcut(QKeySequence(Qt::Key_T), this, SLOT(on_action_Always_on_Top_triggered()));
messagesShortcut = new QShortcut(QKeySequence(Qt::Key_L), this, SLOT(on_action_Messages_triggered()));

#ifndef QT_DEBUG
ui->menuDebug->menuAction()->setVisible(false);
Expand Down Expand Up @@ -901,21 +902,28 @@ void MainWindow::saveSettings()

void MainWindow::mouseMoveEvent(QMouseEvent *event)
{
QRect dragRect = ui->statusBar->rect();
dragRect.setWidth(dragRect.width() - 32); // Hack to allow space for size grip
if (!dragRect.contains(ui->statusBar->mapFromGlobal(QCursor::pos())))
return;

if (event->buttons() & Qt::LeftButton)
{
QSize s = size();
qDebug() << "s, before = " << s;
move(event->globalPos() - dragPosition);
//resize(s);
event->accept();

s = size();
qDebug() << "s, after = " << s;
}
}

void MainWindow::mousePressEvent(QMouseEvent *event)
{
QRect dragRect = ui->statusBar->rect();
dragRect.setWidth(dragRect.width() - 32); // Hack to allow space for size grip
if (!dragRect.contains(ui->statusBar->mapFromGlobal(QCursor::pos())))
return;

if (event->button() == Qt::LeftButton)
{
dragPosition = event->globalPos() - frameGeometry().topLeft();
Expand Down Expand Up @@ -1558,9 +1566,11 @@ void MainWindow::gotSystemClick(const QString& name)
chatModel->subsetForSystem(name);

if(name == "")
ui->listLabel->setText("All Messages:");
ui->dockWidget->setWindowTitle("All Messages:");
// ui->listLabel->setText("All Messages:");
else
ui->listLabel->setText(name + " Messages:");
ui->dockWidget->setWindowTitle(name + " Messages:");
// ui->listLabel->setText(name + " Messages:");

ui->listView->scrollToBottom();
}
Expand All @@ -1575,9 +1585,11 @@ void MainWindow::on_actionFindMessages_triggered()
}

if(dialog.input() == "")
ui->listLabel->setText("All Messages:");
ui->dockWidget->setWindowTitle("All Messages:");
// ui->listLabel->setText("All Messages:");
else
ui->listLabel->setText("'" + dialog.input() + "'");
ui->dockWidget->setWindowTitle("'" + dialog.input() + "'");
// ui->listLabel->setText("'" + dialog.input() + "'");

ui->listView->scrollToBottom();
}
Expand Down Expand Up @@ -1640,6 +1652,9 @@ void MainWindow::on_action_Overlay_Mode_triggered()
ui->menuBar->setAutoFillBackground(false);
ui->centralWidget->setAutoFillBackground(false);
ui->statusBar->setAutoFillBackground(false);
ui->dockWidget->setAutoFillBackground(false);
ui->dockWidgetContents->setAutoFillBackground(false);
ui->listView->setAutoFillBackground(false);

if(!frameless)
{
Expand All @@ -1658,6 +1673,9 @@ void MainWindow::on_action_Overlay_Mode_triggered()
ui->menuBar->setAutoFillBackground(true);
ui->centralWidget->setAutoFillBackground(true);
ui->statusBar->setAutoFillBackground(true);
ui->dockWidget->setAutoFillBackground(true);
ui->dockWidgetContents->setAutoFillBackground(true);
ui->listView->setAutoFillBackground(true);

Qt::WindowFlags newFlags = flags;
if(alwaysOnTop == false && (flags & Qt::WindowStaysOnTopHint))
Expand Down Expand Up @@ -1730,3 +1748,17 @@ void MainWindow::gotStyleSheetChange(const QString styleName)
qApp->setStyleSheet(all);
}
}

void MainWindow::on_action_Messages_triggered()
{
if(ui->dockWidget->isVisible())
ui->dockWidget->hide();
else
ui->dockWidget->show();
}


void MainWindow::on_dockWidget_visibilityChanged(bool visible)
{

}
3 changes: 3 additions & 0 deletions src/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ private slots:
void on_action_Overlay_Mode_triggered();
void on_action_Frameless_Window_triggered();
void on_action_Menu_Toggle_triggered();
void on_action_Messages_triggered();
void on_dockWidget_visibilityChanged(bool visible);

private:
void initParsing();
Expand Down Expand Up @@ -150,6 +152,7 @@ private slots:
QShortcut* alwaysOnTopShortcut = NULL;
QShortcut* framelessShortcut = NULL;
QShortcut* menuShortcut = NULL;
QShortcut* messagesShortcut = NULL;
QShortcut* overlayShortcut = NULL;

QPoint dragPosition;
Expand Down
Loading

0 comments on commit e364822

Please sign in to comment.