[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kopete/dev-0.12/kopete/protocols
From:       Johann Ollivier Lapeyre <johann.ollivierlapeyre () gmail ! com>
Date:       2006-01-30 20:44:47
Message-ID: 1138653887.397266.30448.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 503945 by johann_ol:

start to harmonize msn/jabber/yahoo menus and toolbar


 M  +2 -2      jabber/jabberchatui.rc  
 M  +1 -1      msn/msnchatsession.cpp  
 M  +7 -10     msn/msnchatui.rc  
 M  +6 -4      yahoo/yahoochatui.rc  


--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabberchatui.rc \
#503944:503945 @@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="8" name="kopete_jabber_chat">
+<kpartgui version="9" name="kopete_jabber_chat">
 	<MenuBar>
 		<Menu noMerge="1" name="file">
 			<text>&amp;Chat</text>
@@ -8,7 +8,7 @@
 	</MenuBar>
 
 
-	<ToolBar name="mainToolBar">
+	<ToolBar name="statusToolBar">
 		<Action name="jabber_voicecall" />
 	</ToolBar>
 
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/msnchatsession.cpp \
#503944:503945 @@ -75,7 +75,7 @@
 		protocol,  SIGNAL( invitation(MSNInvitation*& ,  const QString & , long unsigned \
int , MSNChatSession*  , MSNContact*  ) ) );  
 
-	m_actionInvite = new KActionMenu( i18n( "&Invite" ), actionCollection() , \
"msnInvite" ); +	m_actionInvite = new KActionMenu( i18n( "&Invite" ), \
actionCollection() , "kontact_contacts" );  connect ( m_actionInvite->popupMenu() , \
SIGNAL( aboutToShow() ) , this , SLOT(slotActionInviteAboutToShow() ) ) ;  
 	#if !defined NDEBUG
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/msnchatui.rc #503944:503945
@@ -1,28 +1,25 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="10" name="kopete_msn_chat">
+<kpartgui version="11" name="kopete_msn_chat">
 	<MenuBar>
 		<Menu noMerge="1" name="file">
 			<text>&amp;Chat</text>
-			<Action name="msnInvite" />
-			<Action name="msnRequestDisplayPicture" />
+			<Action name="msnWebcamReceive" />
+			<Action name="msnWebcamSend" />
 			<Action name="msnSendNudge" />
+			<Action name="msnRequestDisplayPicture" />
+			<Action name="msnInvite" />
 <!--			<Menu name="debug">
 				<text>&amp;Debug</text>
 				<Action name="msnDebugRawCommand" />
 			</Menu> -->
-			<Menu name="webcam">
-				<text>&amp;Webcam</text>
-				<Action name="msnWebcamSend" />
-				<Action name="msnWebcamReceive" />
-			</Menu> 
 		</Menu>
 	</MenuBar>
 
 
 	<ToolBar name="statusToolBar">
 		<Action name="msnDisplayPicture" />
-		<Action name="msnSendNudge" />
-		<Action name="msnWebcamSend" />
 		<Action name="msnWebcamReceive" />	
+		<Action name="msnWebcamSend" />
+		<Action name="msnSendNudge" />
 	</ToolBar>
 </kpartgui>
--- branches/work/kopete/dev-0.12/kopete/protocols/yahoo/yahoochatui.rc \
#503944:503945 @@ -1,20 +1,22 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="7" name="kopete_yahoo_chat">
+<kpartgui version="8" name="kopete_yahoo_chat">
 	<MenuBar>
 		<Menu noMerge="1" name="file">
+			<Action name="yahooRequestWebcam" />
+			<Action name="yahooSendWebcam" />	
 			<Action name="yahooBuzz" />
 			<Action name="yahooShowInfo" />
-			<Action name="yahooRequestWebcam" />
 		</Menu>
 	</MenuBar>
 
 
 	<ToolBar name="statusToolBar">
 		<Action name="yahooDisplayPicture" />
+		<Action name="yahooRequestWebcam" />	
+		<Action name="yahooSendWebcam" />		
 		<Action name="yahooBuzz" />
 		<Action name="yahooShowInfo" />		
-		<Action name="yahooRequestWebcam" />	
-		<Action name="yahooSendWebcam" />	
+	
 	</ToolBar>
 
 


[prev in list] [next in list] [prev in thread] [next in thread]