fixed lang, notifywindow init and sendToMenu hiding not in windows

telegramdesktop · Jul 18, 2014 · 41c1eff · 41c1eff
1 parent 070ea58
commit 41c1eff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Telegram/Resources/lang.txt b/Telegram/Resources/lang.txt
@@ -141,7 +141,7 @@ lng_settings_section_notify: "Notifications";
 lng_settings_desktop_notify: "Desktop notifications";
 lng_settings_show_name: "Show sender's name";
 lng_settings_show_preview: "Show message preview";
-lng_settings_sound_notify: "Sound notification";
+lng_settings_sound_notify: "Play sound";
 
 lng_notification_title: "Telegram Desktop";
 lng_notification_preview: "You have a new message";

diff --git a/Telegram/SourceFiles/gui/flattextarea.cpp b/Telegram/SourceFiles/gui/flattextarea.cpp
@@ -446,7 +446,7 @@ void FlatTextarea::keyPressEvent(QKeyEvent *e) {
 		emit submitted();
 	} else if (e->key() == Qt::Key_Escape) {
 		emit cancelled();
-	} else if (e->key() == Qt::Key_Tab || ctrl && e->key() == Qt::Key_Backtab) {
+	} else if (e->key() == Qt::Key_Tab || (ctrl && e->key() == Qt::Key_Backtab)) {
 		if (ctrl) {
 			e->ignore();
 		} else {

diff --git a/Telegram/SourceFiles/settingswidget.cpp b/Telegram/SourceFiles/settingswidget.cpp
@@ -664,7 +664,7 @@ void SettingsInner::showAll() {
         _autoStart.hide();
         _startMinimized.hide();
 
-		_sendToMenu.show();
+		_sendToMenu.hide();
 	}
     if (cRetina()) {
         _dpiSlider.hide();

diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
@@ -77,7 +77,7 @@ void TempDirDeleter::onStart() {
 }
 
 
-NotifyWindow::NotifyWindow(HistoryItem *item, int32 x, int32 y) : item(item), history(item->history())
+NotifyWindow::NotifyWindow(HistoryItem *msg, int32 x, int32 y) : history(msg->history()), item(msg)
 #ifdef Q_OS_WIN
 , started(GetTickCount())
 #endif