mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 16:15:23 -04:00
New class for the work with emoticons - Emoticons
Redesigned emoticons window - flat buttons - 9 icons in a row - moved the window to the direction of the input object git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3487 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
6e771af2b6
commit
0b63a4be86
15 changed files with 272 additions and 196 deletions
|
@ -39,6 +39,7 @@
|
|||
#include "gui/settings/RsharePeerSettings.h"
|
||||
#include "gui/connect/ConfCertDialog.h"
|
||||
#include "idle/idle.h"
|
||||
#include "gui/common/Emoticons.h"
|
||||
|
||||
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
|
||||
#include <gui/qskinobject/qskinobject.h>
|
||||
|
@ -168,6 +169,8 @@ int main(int argc, char *argv[])
|
|||
|
||||
rshare.setQuitOnLastWindowClosed(true);
|
||||
#else
|
||||
Emoticons::load();
|
||||
|
||||
MainWindow *w = MainWindow::Create ();
|
||||
|
||||
// I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue