hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 02:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed win version after os x build

Browse source
This commit is contained in:
John Preston 2014-06-25 21:50:27 +04:00
parent 0c7baa86a4
commit e5d083ca13
14 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/_other/genemoji.h
View file

@ -40,17 +40,17 @@ using std::exception;
class Exception : public exception { class Exception : public exception {
public: public:
Exception(const QString &msg) : _msg(msg) { Exception(const QString &msg) : _msg(msg.toUtf8()) {
} }
virtual const char *what() const throw() { virtual const char *what() const throw() {
return _msg.toUtf8().constData(); return _msg.constData();
} }
virtual ~Exception() throw() { virtual ~Exception() throw() {
} }
private: private:
QString _msg; QByteArray _msg;
}; };
bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_png); bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_png);

6
Telegram/SourceFiles/_other/genlang.h
View file

@ -38,17 +38,17 @@ using std::exception;
class Exception : public exception { class Exception : public exception {
public: public:
Exception(const QString &msg) : _msg(msg) { Exception(const QString &msg) : _msg(msg.toUtf8()) {
} }
virtual const char *what() const throw() { virtual const char *what() const throw() {
return _msg.toUtf8().constData(); return _msg.constData();
} }
virtual ~Exception() throw() { virtual ~Exception() throw() {
} }
private: private:
QString _msg; QByteArray _msg;
}; };
bool genLang(const QString &lang_in, const QString &lang_out); bool genLang(const QString &lang_in, const QString &lang_out);

6
Telegram/SourceFiles/_other/genstyles.h
View file

@ -37,17 +37,17 @@ using std::exception;
class Exception : public exception { class Exception : public exception {
public: public:
Exception(const QString &msg) : _msg(msg) { Exception(const QString &msg) : _msg(msg.toUtf8()) {
} }
virtual const char *what() const throw() { virtual const char *what() const throw() {
return _msg.toUtf8().constData(); return _msg.constData();
} }
virtual ~Exception() throw() { virtual ~Exception() throw() {
} }
private: private:
QString _msg; QByteArray _msg;
}; };
bool genStyles(const QString &classes_in, const QString &classes_out, const QString &styles_in, const QString &styles_out, const QString &path_to_sprites); bool genStyles(const QString &classes_in, const QString &classes_out, const QString &styles_in, const QString &styles_out, const QString &path_to_sprites);

BIN
Telegram/SourceFiles/art/grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
Telegram/SourceFiles/art/grid_125x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Telegram/SourceFiles/art/grid_150x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
Telegram/SourceFiles/art/grid_200x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Telegram/SourceFiles/art/sprite_125x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 58 KiB

BIN
Telegram/SourceFiles/art/sprite_150x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 68 KiB

2
Telegram/SourceFiles/gui/twidget.h
View file

@ -31,7 +31,7 @@ public:
return dynamic_cast<const TWidget*>(parentWidget()); return dynamic_cast<const TWidget*>(parentWidget());
} }
virtual void leaveToChildEvent(QEvent */*e*/) { // e -- from enterEvent() of child TWidget virtual void leaveToChildEvent(QEvent *e) { // e -- from enterEvent() of child TWidget
} }
protected: protected:

5
Telegram/SourceFiles/pspecific_wnd.cpp
View file

@ -895,8 +895,9 @@ void PsMainWindow::psIdleTimeout() {
} }
} }
bool PsMainWindow::psIsActive() const { bool PsMainWindow::psIsActive(int state) const {
return isActiveWindow() && isVisible() && !(windowState() & Qt::WindowMinimized) && !psIdle; if (state < 0) state = this->windowState();
return isActiveWindow() && isVisible() && !(state & Qt::WindowMinimized) && !psIdle;
} }
bool PsMainWindow::psIsOnline(int windowState) const { bool PsMainWindow::psIsOnline(int windowState) const {

2
Telegram/SourceFiles/pspecific_wnd.h
View file

@ -102,7 +102,7 @@ public:
void psFlash(); void psFlash();
void psNotifySettingGot(); void psNotifySettingGot();
bool psIsActive() const; bool psIsActive(int state = -1) const;
bool psIsOnline(int windowState) const; bool psIsOnline(int windowState) const;
void psUpdateWorkmode(); void psUpdateWorkmode();

6
Telegram/SourceFiles/types.h
View file

@ -49,7 +49,7 @@ using std::swap;
class Exception : public exception { class Exception : public exception {
public: public:
Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg) { Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg.toUtf8()) {
LOG(("Exception: %1").arg(msg)); LOG(("Exception: %1").arg(msg));
} }
bool fatal() const { bool fatal() const {
@ -57,14 +57,14 @@ public:
} }
virtual const char *what() const throw() { virtual const char *what() const throw() {
return _msg.toUtf8().constData(); return _msg.constData();
} }
virtual ~Exception() throw() { virtual ~Exception() throw() {
} }
private: private:
bool _fatal; bool _fatal;
QString _msg; QByteArray _msg;
}; };
class MTPint; class MTPint;

4
Telegram/Telegram.vcxproj
View file

@ -793,11 +793,11 @@
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\style_classes.txt"> <CustomBuild Include="Resources\style_classes.txt">
<Outputs>.\GeneratedFiles\style_classes.h</Outputs> <Outputs>.\GeneratedFiles\style_classes.h</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h"</Command> <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\style.txt"> <CustomBuild Include="Resources\style.txt">
<Outputs>.\GeneratedFiles\style_auto.h</Outputs> <Outputs>.\GeneratedFiles\style_auto.h</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h"</Command> <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\lang.txt"> <CustomBuild Include="Resources\lang.txt">
<Outputs>.\GeneratedFiles\lang.h</Outputs> <Outputs>.\GeneratedFiles\lang.h</Outputs>