From: <ks...@us...> - 2012-05-25 10:31:03
|
Revision: 4490 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4490&view=rev Author: ksya Date: 2012-05-25 10:30:51 +0000 (Fri, 25 May 2012) Log Message: ----------- update Modified Paths: -------------- trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.dll trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.pdb trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/update.xml trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/OperaMobileLauncher.dll trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/OperaMobileLauncher.pdb trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/ResGen.read.1.tlog trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/ResGen.write.1.tlog trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/ResolveAssemblyReference.cache trunk/plugins/OperaMobileLauncher/OperaMobileLauncher.suo Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -28,332 +28,332 @@ /// </summary> private void InitializeComponent() { - this.buttonOk = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.imageFileName_Button = new System.Windows.Forms.Button(); - this.imageFileName_Editbox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.test_btn = new System.Windows.Forms.Button(); - this.fullscreen_chk = new System.Windows.Forms.CheckBox(); - this.touchinterface_chk = new System.Windows.Forms.CheckBox(); - this.customargs_txt = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.widthZoom_txt = new System.Windows.Forms.TextBox(); - this.widthZoom_chk = new System.Windows.Forms.CheckBox(); - this.ApplyOpera_btn = new System.Windows.Forms.Button(); - this.downloadLink = new System.Windows.Forms.LinkLabel(); - this.minFontSize_nud = new System.Windows.Forms.NumericUpDown(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.setToDesktopUA_btn = new System.Windows.Forms.Button(); - this.customUA_txt = new System.Windows.Forms.TextBox(); - this.useCustomUA_chk = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.useMinFontsize_chk = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); - this.openHelp_btn = new System.Windows.Forms.Button(); - this.useButtonForwarding = new System.Windows.Forms.CheckBox(); - ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).BeginInit(); - this.groupBox1.SuspendLayout(); - this.SuspendLayout(); - // - // buttonOk - // - this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOk.Location = new System.Drawing.Point(362, 436); - this.buttonOk.Name = "buttonOk"; - this.buttonOk.Size = new System.Drawing.Size(75, 23); - this.buttonOk.TabIndex = 2; - this.buttonOk.Text = "Save"; - this.buttonOk.UseVisualStyleBackColor = true; - this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); - // - // buttonCancel - // - this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(443, 436); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 2; - this.buttonCancel.Text = "Cancel"; - this.buttonCancel.UseVisualStyleBackColor = true; - // - // imageFileName_Button - // - this.imageFileName_Button.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imageFileName_Button.Location = new System.Drawing.Point(493, 24); - this.imageFileName_Button.Name = "imageFileName_Button"; - this.imageFileName_Button.Size = new System.Drawing.Size(27, 23); - this.imageFileName_Button.TabIndex = 19; - this.imageFileName_Button.Text = "..."; - this.imageFileName_Button.UseVisualStyleBackColor = true; - this.imageFileName_Button.Click += new System.EventHandler(this.imageFileName_Button_Click); - // - // imageFileName_Editbox - // - this.imageFileName_Editbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.imageFileName_Editbox.Location = new System.Drawing.Point(15, 26); - this.imageFileName_Editbox.Name = "imageFileName_Editbox"; - this.imageFileName_Editbox.Size = new System.Drawing.Size(472, 20); - this.imageFileName_Editbox.TabIndex = 20; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 9); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(179, 13); - this.label4.TabIndex = 21; - this.label4.Text = "Select the Opera Mobile executable:"; - // - // test_btn - // - this.test_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.test_btn.Location = new System.Drawing.Point(15, 436); - this.test_btn.Name = "test_btn"; - this.test_btn.Size = new System.Drawing.Size(52, 23); - this.test_btn.TabIndex = 22; - this.test_btn.Text = "Test"; - this.test_btn.UseVisualStyleBackColor = true; - this.test_btn.Click += new System.EventHandler(this.test_btn_Click); - // - // fullscreen_chk - // - this.fullscreen_chk.AutoSize = true; - this.fullscreen_chk.Location = new System.Drawing.Point(15, 53); - this.fullscreen_chk.Name = "fullscreen_chk"; - this.fullscreen_chk.Size = new System.Drawing.Size(293, 17); - this.fullscreen_chk.TabIndex = 23; - this.fullscreen_chk.Text = "Do not start in fullscreen (clears the -fullscreen argument)"; - this.fullscreen_chk.UseVisualStyleBackColor = true; - // - // touchinterface_chk - // - this.touchinterface_chk.AutoSize = true; - this.touchinterface_chk.Location = new System.Drawing.Point(15, 73); - this.touchinterface_chk.Name = "touchinterface_chk"; - this.touchinterface_chk.Size = new System.Drawing.Size(231, 17); - this.touchinterface_chk.TabIndex = 24; - this.touchinterface_chk.Text = "Use the touch interface (not recommended)"; - this.touchinterface_chk.UseVisualStyleBackColor = true; - // - // customargs_txt - // - this.customargs_txt.Location = new System.Drawing.Point(15, 116); - this.customargs_txt.Name = "customargs_txt"; - this.customargs_txt.Size = new System.Drawing.Size(250, 20); - this.customargs_txt.TabIndex = 25; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 99); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(97, 13); - this.label1.TabIndex = 26; - this.label1.Text = "Custom arguments:"; - // - // widthZoom_txt - // - this.widthZoom_txt.Enabled = false; - this.widthZoom_txt.Location = new System.Drawing.Point(9, 44); - this.widthZoom_txt.Name = "widthZoom_txt"; - this.widthZoom_txt.Size = new System.Drawing.Size(59, 20); - this.widthZoom_txt.TabIndex = 28; - // - // widthZoom_chk - // - this.widthZoom_chk.AutoSize = true; - this.widthZoom_chk.Location = new System.Drawing.Point(9, 24); - this.widthZoom_chk.Name = "widthZoom_chk"; - this.widthZoom_chk.Size = new System.Drawing.Size(279, 17); - this.widthZoom_chk.TabIndex = 29; - this.widthZoom_chk.Text = "Zoom to fit and use minimum width of: (recommended)"; - this.widthZoom_chk.UseVisualStyleBackColor = true; - this.widthZoom_chk.CheckedChanged += new System.EventHandler(this.widthZoom_chk_CheckedChanged); - // - // ApplyOpera_btn - // - this.ApplyOpera_btn.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.ApplyOpera_btn.ForeColor = System.Drawing.Color.DarkBlue; - this.ApplyOpera_btn.Location = new System.Drawing.Point(165, 172); - this.ApplyOpera_btn.Name = "ApplyOpera_btn"; - this.ApplyOpera_btn.Size = new System.Drawing.Size(173, 23); - this.ApplyOpera_btn.TabIndex = 30; - this.ApplyOpera_btn.Text = "Apply settings to Opera Mobile"; - this.ApplyOpera_btn.UseVisualStyleBackColor = false; - this.ApplyOpera_btn.Click += new System.EventHandler(this.ApplyOpera_btn_Click); - // - // downloadLink - // - this.downloadLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.downloadLink.AutoSize = true; - this.downloadLink.Location = new System.Drawing.Point(343, 416); - this.downloadLink.Name = "downloadLink"; - this.downloadLink.Size = new System.Drawing.Size(165, 13); - this.downloadLink.TabIndex = 31; - this.downloadLink.TabStop = true; - this.downloadLink.Text = "Download Opera Mobile Emulator"; - this.downloadLink.TextAlign = System.Drawing.ContentAlignment.TopRight; - this.downloadLink.Click += new System.EventHandler(this.downloadLink_Click); - // - // minFontSize_nud - // - this.minFontSize_nud.Enabled = false; - this.minFontSize_nud.Location = new System.Drawing.Point(9, 88); - this.minFontSize_nud.Name = "minFontSize_nud"; - this.minFontSize_nud.Size = new System.Drawing.Size(51, 20); - this.minFontSize_nud.TabIndex = 33; - this.minFontSize_nud.Value = new decimal(new int[] { + this.buttonOk = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.imageFileName_Button = new System.Windows.Forms.Button(); + this.imageFileName_Editbox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.test_btn = new System.Windows.Forms.Button(); + this.fullscreen_chk = new System.Windows.Forms.CheckBox(); + this.touchinterface_chk = new System.Windows.Forms.CheckBox(); + this.customargs_txt = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.widthZoom_txt = new System.Windows.Forms.TextBox(); + this.widthZoom_chk = new System.Windows.Forms.CheckBox(); + this.ApplyOpera_btn = new System.Windows.Forms.Button(); + this.downloadLink = new System.Windows.Forms.LinkLabel(); + this.minFontSize_nud = new System.Windows.Forms.NumericUpDown(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.setToDesktopUA_btn = new System.Windows.Forms.Button(); + this.customUA_txt = new System.Windows.Forms.TextBox(); + this.useCustomUA_chk = new System.Windows.Forms.CheckBox(); + this.label2 = new System.Windows.Forms.Label(); + this.useMinFontsize_chk = new System.Windows.Forms.CheckBox(); + this.label3 = new System.Windows.Forms.Label(); + this.openHelp_btn = new System.Windows.Forms.Button(); + this.useButtonForwarding = new System.Windows.Forms.CheckBox(); + ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).BeginInit(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // buttonOk + // + this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; + this.buttonOk.Location = new System.Drawing.Point(362, 436); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(75, 23); + this.buttonOk.TabIndex = 2; + this.buttonOk.Text = "Save"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(443, 436); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 2; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // imageFileName_Button + // + this.imageFileName_Button.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.imageFileName_Button.Location = new System.Drawing.Point(493, 24); + this.imageFileName_Button.Name = "imageFileName_Button"; + this.imageFileName_Button.Size = new System.Drawing.Size(27, 23); + this.imageFileName_Button.TabIndex = 19; + this.imageFileName_Button.Text = "..."; + this.imageFileName_Button.UseVisualStyleBackColor = true; + this.imageFileName_Button.Click += new System.EventHandler(this.imageFileName_Button_Click); + // + // imageFileName_Editbox + // + this.imageFileName_Editbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.imageFileName_Editbox.Location = new System.Drawing.Point(15, 26); + this.imageFileName_Editbox.Name = "imageFileName_Editbox"; + this.imageFileName_Editbox.Size = new System.Drawing.Size(472, 20); + this.imageFileName_Editbox.TabIndex = 20; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(12, 9); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(179, 13); + this.label4.TabIndex = 21; + this.label4.Text = "Select the Opera Mobile executable:"; + // + // test_btn + // + this.test_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.test_btn.Location = new System.Drawing.Point(15, 436); + this.test_btn.Name = "test_btn"; + this.test_btn.Size = new System.Drawing.Size(52, 23); + this.test_btn.TabIndex = 22; + this.test_btn.Text = "Test"; + this.test_btn.UseVisualStyleBackColor = true; + this.test_btn.Click += new System.EventHandler(this.test_btn_Click); + // + // fullscreen_chk + // + this.fullscreen_chk.AutoSize = true; + this.fullscreen_chk.Location = new System.Drawing.Point(15, 53); + this.fullscreen_chk.Name = "fullscreen_chk"; + this.fullscreen_chk.Size = new System.Drawing.Size(293, 17); + this.fullscreen_chk.TabIndex = 23; + this.fullscreen_chk.Text = "Do not start in fullscreen (clears the -fullscreen argument)"; + this.fullscreen_chk.UseVisualStyleBackColor = true; + // + // touchinterface_chk + // + this.touchinterface_chk.AutoSize = true; + this.touchinterface_chk.Location = new System.Drawing.Point(15, 73); + this.touchinterface_chk.Name = "touchinterface_chk"; + this.touchinterface_chk.Size = new System.Drawing.Size(231, 17); + this.touchinterface_chk.TabIndex = 24; + this.touchinterface_chk.Text = "Use the touch interface (not recommended)"; + this.touchinterface_chk.UseVisualStyleBackColor = true; + // + // customargs_txt + // + this.customargs_txt.Location = new System.Drawing.Point(15, 116); + this.customargs_txt.Name = "customargs_txt"; + this.customargs_txt.Size = new System.Drawing.Size(250, 20); + this.customargs_txt.TabIndex = 25; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 99); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(97, 13); + this.label1.TabIndex = 26; + this.label1.Text = "Custom arguments:"; + // + // widthZoom_txt + // + this.widthZoom_txt.Enabled = false; + this.widthZoom_txt.Location = new System.Drawing.Point(9, 44); + this.widthZoom_txt.Name = "widthZoom_txt"; + this.widthZoom_txt.Size = new System.Drawing.Size(59, 20); + this.widthZoom_txt.TabIndex = 28; + // + // widthZoom_chk + // + this.widthZoom_chk.AutoSize = true; + this.widthZoom_chk.Location = new System.Drawing.Point(9, 24); + this.widthZoom_chk.Name = "widthZoom_chk"; + this.widthZoom_chk.Size = new System.Drawing.Size(279, 17); + this.widthZoom_chk.TabIndex = 29; + this.widthZoom_chk.Text = "Zoom to fit and use minimum width of: (recommended)"; + this.widthZoom_chk.UseVisualStyleBackColor = true; + this.widthZoom_chk.CheckedChanged += new System.EventHandler(this.widthZoom_chk_CheckedChanged); + // + // ApplyOpera_btn + // + this.ApplyOpera_btn.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.ApplyOpera_btn.ForeColor = System.Drawing.Color.DarkBlue; + this.ApplyOpera_btn.Location = new System.Drawing.Point(165, 172); + this.ApplyOpera_btn.Name = "ApplyOpera_btn"; + this.ApplyOpera_btn.Size = new System.Drawing.Size(173, 23); + this.ApplyOpera_btn.TabIndex = 30; + this.ApplyOpera_btn.Text = "Apply settings to Opera Mobile"; + this.ApplyOpera_btn.UseVisualStyleBackColor = false; + this.ApplyOpera_btn.Click += new System.EventHandler(this.ApplyOpera_btn_Click); + // + // downloadLink + // + this.downloadLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.downloadLink.AutoSize = true; + this.downloadLink.Location = new System.Drawing.Point(343, 416); + this.downloadLink.Name = "downloadLink"; + this.downloadLink.Size = new System.Drawing.Size(165, 13); + this.downloadLink.TabIndex = 31; + this.downloadLink.TabStop = true; + this.downloadLink.Text = "Download Opera Mobile Emulator"; + this.downloadLink.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.downloadLink.Click += new System.EventHandler(this.downloadLink_Click); + // + // minFontSize_nud + // + this.minFontSize_nud.Enabled = false; + this.minFontSize_nud.Location = new System.Drawing.Point(9, 88); + this.minFontSize_nud.Name = "minFontSize_nud"; + this.minFontSize_nud.Size = new System.Drawing.Size(51, 20); + this.minFontSize_nud.TabIndex = 33; + this.minFontSize_nud.Value = new decimal(new int[] { 10, 0, 0, 0}); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.setToDesktopUA_btn); - this.groupBox1.Controls.Add(this.customUA_txt); - this.groupBox1.Controls.Add(this.useCustomUA_chk); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.useMinFontsize_chk); - this.groupBox1.Controls.Add(this.minFontSize_nud); - this.groupBox1.Controls.Add(this.ApplyOpera_btn); - this.groupBox1.Controls.Add(this.widthZoom_txt); - this.groupBox1.Controls.Add(this.widthZoom_chk); - this.groupBox1.Location = new System.Drawing.Point(12, 196); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(505, 201); - this.groupBox1.TabIndex = 34; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "These settings need to be applied first"; - // - // setToDesktopUA_btn - // - this.setToDesktopUA_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.setToDesktopUA_btn.Enabled = false; - this.setToDesktopUA_btn.Location = new System.Drawing.Point(406, 133); - this.setToDesktopUA_btn.Name = "setToDesktopUA_btn"; - this.setToDesktopUA_btn.Size = new System.Drawing.Size(88, 23); - this.setToDesktopUA_btn.TabIndex = 38; - this.setToDesktopUA_btn.Text = "Set to desktop"; - this.setToDesktopUA_btn.UseVisualStyleBackColor = true; - this.setToDesktopUA_btn.Click += new System.EventHandler(this.setToDesktopUA_Click); - // - // customUA_txt - // - this.customUA_txt.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.customUA_txt.Enabled = false; - this.customUA_txt.Location = new System.Drawing.Point(9, 135); - this.customUA_txt.Name = "customUA_txt"; - this.customUA_txt.Size = new System.Drawing.Size(391, 20); - this.customUA_txt.TabIndex = 37; - // - // useCustomUA_chk - // - this.useCustomUA_chk.AutoSize = true; - this.useCustomUA_chk.Location = new System.Drawing.Point(9, 114); - this.useCustomUA_chk.Name = "useCustomUA_chk"; - this.useCustomUA_chk.Size = new System.Drawing.Size(276, 17); - this.useCustomUA_chk.TabIndex = 36; - this.useCustomUA_chk.Text = "Use custom User-Agent: (standard is Android/Mobile)"; - this.useCustomUA_chk.UseVisualStyleBackColor = true; - this.useCustomUA_chk.CheckedChanged += new System.EventHandler(this.useCustomUA_chk_CheckedChanged); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(69, 44); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(33, 13); - this.label2.TabIndex = 35; - this.label2.Text = "pixels"; - // - // useMinFontsize_chk - // - this.useMinFontsize_chk.AutoSize = true; - this.useMinFontsize_chk.Location = new System.Drawing.Point(9, 69); - this.useMinFontsize_chk.Name = "useMinFontsize_chk"; - this.useMinFontsize_chk.Size = new System.Drawing.Size(133, 17); - this.useMinFontsize_chk.TabIndex = 34; - this.useMinFontsize_chk.Text = "Use minimum font size:"; - this.useMinFontsize_chk.UseVisualStyleBackColor = true; - this.useMinFontsize_chk.CheckedChanged += new System.EventHandler(this.useMinFontsize_chk_CheckedChanged); - // - // label3 - // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(14, 416); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(83, 13); - this.label3.TabIndex = 35; - this.label3.Text = "0.3 beta - Dragy"; - // - // openHelp_btn - // - this.openHelp_btn.Location = new System.Drawing.Point(268, 114); - this.openHelp_btn.Name = "openHelp_btn"; - this.openHelp_btn.Size = new System.Drawing.Size(75, 23); - this.openHelp_btn.TabIndex = 36; - this.openHelp_btn.Text = "Open help"; - this.openHelp_btn.UseVisualStyleBackColor = true; - this.openHelp_btn.Click += new System.EventHandler(this.openHelp_btn_Click); - // - // useButtonForwarding - // - this.useButtonForwarding.AutoSize = true; - this.useButtonForwarding.Checked = true; - this.useButtonForwarding.CheckState = System.Windows.Forms.CheckState.Checked; - this.useButtonForwarding.Location = new System.Drawing.Point(15, 145); - this.useButtonForwarding.Name = "useButtonForwarding"; - this.useButtonForwarding.Size = new System.Drawing.Size(445, 30); - this.useButtonForwarding.TabIndex = 37; - this.useButtonForwarding.Text = "Use MP to forward remote buttons to Opera Mobile (T9 typing not yet supported/wor" + - "king)\r\n(External app to re-map buttons is still recommended. Don\'t enable when u" + - "sing such app)\r\n"; - this.useButtonForwarding.UseVisualStyleBackColor = true; - // - // FormSettings - // - this.AcceptButton = this.buttonOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(529, 471); - this.Controls.Add(this.useButtonForwarding); - this.Controls.Add(this.openHelp_btn); - this.Controls.Add(this.label3); - this.Controls.Add(this.downloadLink); - this.Controls.Add(this.label1); - this.Controls.Add(this.customargs_txt); - this.Controls.Add(this.touchinterface_chk); - this.Controls.Add(this.fullscreen_chk); - this.Controls.Add(this.test_btn); - this.Controls.Add(this.label4); - this.Controls.Add(this.imageFileName_Editbox); - this.Controls.Add(this.imageFileName_Button); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonOk); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FormSettings"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Opera Mobile Launcher Settings"; - this.Load += new System.EventHandler(this.FormSettings_Load); - ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.setToDesktopUA_btn); + this.groupBox1.Controls.Add(this.customUA_txt); + this.groupBox1.Controls.Add(this.useCustomUA_chk); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.useMinFontsize_chk); + this.groupBox1.Controls.Add(this.minFontSize_nud); + this.groupBox1.Controls.Add(this.ApplyOpera_btn); + this.groupBox1.Controls.Add(this.widthZoom_txt); + this.groupBox1.Controls.Add(this.widthZoom_chk); + this.groupBox1.Location = new System.Drawing.Point(12, 196); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(505, 201); + this.groupBox1.TabIndex = 34; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "These settings need to be applied first"; + // + // setToDesktopUA_btn + // + this.setToDesktopUA_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.setToDesktopUA_btn.Enabled = false; + this.setToDesktopUA_btn.Location = new System.Drawing.Point(406, 133); + this.setToDesktopUA_btn.Name = "setToDesktopUA_btn"; + this.setToDesktopUA_btn.Size = new System.Drawing.Size(88, 23); + this.setToDesktopUA_btn.TabIndex = 38; + this.setToDesktopUA_btn.Text = "Set to desktop"; + this.setToDesktopUA_btn.UseVisualStyleBackColor = true; + this.setToDesktopUA_btn.Click += new System.EventHandler(this.setToDesktopUA_Click); + // + // customUA_txt + // + this.customUA_txt.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.customUA_txt.Enabled = false; + this.customUA_txt.Location = new System.Drawing.Point(9, 135); + this.customUA_txt.Name = "customUA_txt"; + this.customUA_txt.Size = new System.Drawing.Size(391, 20); + this.customUA_txt.TabIndex = 37; + // + // useCustomUA_chk + // + this.useCustomUA_chk.AutoSize = true; + this.useCustomUA_chk.Location = new System.Drawing.Point(9, 114); + this.useCustomUA_chk.Name = "useCustomUA_chk"; + this.useCustomUA_chk.Size = new System.Drawing.Size(276, 17); + this.useCustomUA_chk.TabIndex = 36; + this.useCustomUA_chk.Text = "Use custom User-Agent: (standard is Android/Mobile)"; + this.useCustomUA_chk.UseVisualStyleBackColor = true; + this.useCustomUA_chk.CheckedChanged += new System.EventHandler(this.useCustomUA_chk_CheckedChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(69, 44); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(33, 13); + this.label2.TabIndex = 35; + this.label2.Text = "pixels"; + // + // useMinFontsize_chk + // + this.useMinFontsize_chk.AutoSize = true; + this.useMinFontsize_chk.Location = new System.Drawing.Point(9, 69); + this.useMinFontsize_chk.Name = "useMinFontsize_chk"; + this.useMinFontsize_chk.Size = new System.Drawing.Size(133, 17); + this.useMinFontsize_chk.TabIndex = 34; + this.useMinFontsize_chk.Text = "Use minimum font size:"; + this.useMinFontsize_chk.UseVisualStyleBackColor = true; + this.useMinFontsize_chk.CheckedChanged += new System.EventHandler(this.useMinFontsize_chk_CheckedChanged); + // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(14, 416); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(83, 13); + this.label3.TabIndex = 35; + this.label3.Text = "0.3 beta - Dragy"; + // + // openHelp_btn + // + this.openHelp_btn.Location = new System.Drawing.Point(268, 114); + this.openHelp_btn.Name = "openHelp_btn"; + this.openHelp_btn.Size = new System.Drawing.Size(75, 23); + this.openHelp_btn.TabIndex = 36; + this.openHelp_btn.Text = "Open help"; + this.openHelp_btn.UseVisualStyleBackColor = true; + this.openHelp_btn.Click += new System.EventHandler(this.openHelp_btn_Click); + // + // useButtonForwarding + // + this.useButtonForwarding.AutoSize = true; + this.useButtonForwarding.Checked = true; + this.useButtonForwarding.CheckState = System.Windows.Forms.CheckState.Checked; + this.useButtonForwarding.Location = new System.Drawing.Point(15, 145); + this.useButtonForwarding.Name = "useButtonForwarding"; + this.useButtonForwarding.Size = new System.Drawing.Size(502, 30); + this.useButtonForwarding.TabIndex = 37; + this.useButtonForwarding.Text = "Use MP to forward remote buttons to Opera Mobile (or use EventGhost to remap your" + + " remote buttons \r\nDon\'t enable when you have already remapped your buttons for O" + + "pera Mobile)."; + this.useButtonForwarding.UseVisualStyleBackColor = true; + // + // FormSettings + // + this.AcceptButton = this.buttonOk; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(529, 471); + this.Controls.Add(this.useButtonForwarding); + this.Controls.Add(this.openHelp_btn); + this.Controls.Add(this.label3); + this.Controls.Add(this.downloadLink); + this.Controls.Add(this.label1); + this.Controls.Add(this.customargs_txt); + this.Controls.Add(this.touchinterface_chk); + this.Controls.Add(this.fullscreen_chk); + this.Controls.Add(this.test_btn); + this.Controls.Add(this.label4); + this.Controls.Add(this.imageFileName_Editbox); + this.Controls.Add(this.imageFileName_Button); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "FormSettings"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Opera Mobile Launcher Settings"; + this.Load += new System.EventHandler(this.FormSettings_Load); + ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).EndInit(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -129,6 +129,8 @@ else arguments += " -notouchwithtouchevents"; + arguments += " -hasmenuandback"; + arguments += " "+customargs_txt.Text; opera.StartInfo.FileName = imageFileName_Editbox.Text; @@ -177,7 +179,8 @@ tw.WriteLine("}"); tw.Close(); - string OperaIniFile = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Opera\OperaMobileEmulator\opera.ini"; + string OperaIniFile = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Opera\Mobile\opera.ini"; + Log.Debug(OperaIniFile); if (File.Exists(OperaIniFile)) { Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -5,6 +5,9 @@ using System.IO; using System.Windows.Forms; using System.Runtime.InteropServices; +using System.Text; +using System.Threading; +using System.Text.RegularExpressions; namespace OperaLauncher { @@ -18,55 +21,79 @@ public bool TouchInferface; public string Arguments; public bool UseButtonForwarding; + public IntPtr OperaHwnd = IntPtr.Zero; + public IntPtr MediaPortalHwnd = IntPtr.Zero; + public IntPtr TaskBarHwnd = IntPtr.Zero; - [DllImport("user32.dll")] - public static extern int FindWindow( - string lpClassName, // class name - string lpWindowName // window name - ); + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr FindWindow(string lpClassName, string lpWindowName); + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string className, string windowTitle); + + [DllImport("user32.dll", CharSet = CharSet.Auto)] + static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, int wParam, int lParam); + [DllImport("user32.dll")] - public static extern int SendMessage( - int hWnd, // handle to destination window - uint Msg, // message - int wParam, // first message parameter - int lParam // second message parameter - ); + private static extern bool ShowWindowAsync(IntPtr hWnd, int nCmdShow); [DllImport("user32.dll")] - private static extern bool ShowWindowAsync(int hWnd, int nCmdShow); + private static extern bool BringWindowToTop(IntPtr hWnd); [DllImport("user32.dll")] - private static extern bool BringWindowToTop(int hWnd); + [return: MarshalAs(UnmanagedType.Bool)] + static extern bool EnableWindow(IntPtr hWnd, bool bEnable); [DllImport("user32.dll")] - private static extern bool EnableWindow(int hWnd, bool bEnable); + private static extern IntPtr SetFocus(IntPtr hWnd); + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent); + + [DllImport("user32.dll", SetLastError = true)] + [return: MarshalAs(UnmanagedType.Bool)] + private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags); + + [DllImport("user32.dll", SetLastError = true)] + public static extern IntPtr SetActiveWindow(IntPtr hWnd); + [DllImport("user32.dll")] - private static extern int SetFocus(int hWnd); + [return: MarshalAs(UnmanagedType.Bool)] + static extern bool SetForegroundWindow(IntPtr hWnd); + [DllImport("user32.dll", SetLastError = true)] + static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId); - const int WM_KEYDOWN = 0x0100; - const int WM_KEYUP = 0x0101; - const int WM_APPCOMMAND = 0x0319; - const int SW_HIDE = 0; - const int SW_SHOWNORMAL = 1; - const int SW_SHOWMINIMIZED = 2; - const int SW_SHOWMAXIMIZED = 3; - const int SW_RESTORE = 9; - const int VK_F1 = 0x70; - const int VK_F2 = 0x71; - const int VK_NUMPAD0 = 0x60; - const int VK_NUMPAD1 = 0x61; - const int VK_NUMPAD2 = 0x62; - const int VK_NUMPAD3 = 0x63; - const int VK_NUMPAD4 = 0x64; - const int VK_NUMPAD5 = 0x65; - const int VK_NUMPAD6 = 0x66; - const int VK_NUMPAD7 = 0x67; - const int VK_NUMPAD8 = 0x68; - const int VK_NUMPAD9 = 0x69; + private const int WM_KEYDOWN = 0x0100; + private const int WM_KEYUP = 0x0101; + private const int WM_APPCOMMAND = 0x0319; + + private const int VK_RETURN = 0x0D; + private const int VK_LEFT = 0x25; + private const int VK_UP = 0x26; + private const int VK_RIGHT = 0x27; + private const int VK_DOWN = 0x28; + private const int VK_F1 = 0x70; + private const int VK_F2 = 0x71; + private const int VK_NUMPAD0 = 0x60; + private const int VK_NUMPAD1 = 0x61; + private const int VK_NUMPAD2 = 0x62; + private const int VK_NUMPAD3 = 0x63; + private const int VK_NUMPAD4 = 0x64; + private const int VK_NUMPAD5 = 0x65; + private const int VK_NUMPAD6 = 0x66; + private const int VK_NUMPAD7 = 0x67; + private const int VK_NUMPAD8 = 0x68; + private const int VK_NUMPAD9 = 0x69; + private const int VK_BACK = 0x8; + + private const int SWP_HIDEWINDOW = 0x80; + private const int SWP_SHOWWINDOW = 0x40; + private const int SWP_NOMOVE = 0x2; + + public string MediaPortalWindowName = "WindowsForms10.Window.8.app.0.2386859"; + ProcessStartInfo startInfo = new ProcessStartInfo(); Process opera = new Process(); public OperaLauncher() @@ -89,15 +116,18 @@ if(!UseButtonForwarding) GUIWindowManager.ShowPreviousWindow(); base.OnPageLoad(); + } protected override void OnPageDestroy(int newWindowId) { //close opera opera.CloseMainWindow(); - - /*int WindowToFind = FindWindow("WindowsForms10.Window.8.app.0.2386859", null); - bool test = ShowWindowAsync(WindowToFind, SW_RESTORE);*/ + if (UseButtonForwarding) + { + SetWindowPos(TaskBarHwnd, IntPtr.Zero, 0, 0, 0, 0, SWP_SHOWWINDOW); + ShowWindowAsync(FindWindow(MediaPortalWindowName, null), 9); //restore MP + } } public void startOpera(string strUrl = null) @@ -110,6 +140,7 @@ else arguments += " -notouchwithtouchevents"; + arguments += " -hasmenuandback"; arguments += " " + Arguments; opera.StartInfo.FileName = @Path; @@ -119,20 +150,43 @@ else opera.StartInfo.Arguments = arguments; + opera.StartInfo.CreateNoWindow = true; + //opera.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + try { opera.Start(); + opera.WaitForInputIdle(); - int OperaHandle = FindWindow("QWidget", null); - bool top = BringWindowToTop(OperaHandle); - + //ShowWindowAsync(MediaPortalHwnd, 0); //verberg MP + if (UseButtonForwarding) { - int MPHandle = FindWindow("WindowsForms10.Window.8.app.0.2386859", null); - int disableinput = SetFocus(MPHandle); - Log.Info("Set focus: (MP Handle: " + MPHandle.ToString() + ", Focus: " + disableinput + ")"); + Thread.Sleep(100); // <-- ugly hack + + if (opera.MainWindowHandle == IntPtr.Zero) + { + Log.Debug("Opera process handle not found, finding by Window name"); + OperaHwnd = FindOperaWindowHandle(); + } + else + { + OperaHwnd = opera.MainWindowHandle; + Log.Debug("opera.MainWindowHandle: " + opera.MainWindowHandle); + } + + MediaPortalHwnd = FindWindow(MediaPortalWindowName, null); + + Log.Debug("Opera Handle: " + OperaHwnd); + Log.Debug("MediaPortal Handle: " + MediaPortalHwnd); + + TaskBarHwnd = FindWindow("Shell_traywnd", ""); + SetWindowPos(TaskBarHwnd, IntPtr.Zero, 0, 0, 0, 0, SWP_HIDEWINDOW); // Hide Taskbar + + SetForegroundWindow(MediaPortalHwnd); //mediaportal to foreground + SetWindowPos(MediaPortalHwnd, OperaHwnd, 0, 0, SystemInformation.PrimaryMonitorSize.Width, SystemInformation.PrimaryMonitorSize.Height, SWP_HIDEWINDOW | SWP_NOMOVE); //mediaportol on top, but hidden } - //bool test = ShowWindowAsync(WindowToFind, SW_HIDE); + Cursor.Hide(); } catch (Exception ex) @@ -142,54 +196,165 @@ } } + public IntPtr FindOperaWindowHandle() + { + string OperaWindowName = "Opera Mobile (480x800)"; + if (!noFullscreen) + { + OperaWindowName = "Opera Mobile (" + SystemInformation.PrimaryMonitorSize.Width + "x" + SystemInformation.PrimaryMonitorSize.Height + ")"; + } + else if (Arguments.Contains("-displaysize")) + { + Match match = Regex.Match(Arguments, @"-displaysize ([0-9x]*)\s*", RegexOptions.IgnoreCase); + if (match.Success) + { + // Finally, we get the Group value and display it. + string resolution = match.Groups[1].Value; + OperaWindowName = "Opera Mobile (" + resolution + ")"; + } + } + + Log.Debug("OperaWindowName: " + OperaWindowName); + OperaHwnd = FindWindowEx(IntPtr.Zero, IntPtr.Zero, "QWidget", OperaWindowName); + Log.Debug("OperaHwnd: " + OperaHwnd); + return OperaHwnd; + } public override void OnAction(MediaPortal.GUI.Library.Action action) { if (UseButtonForwarding) { - int WindowToFind = FindWindow("QWidget", null); - switch (action.wID) { case MediaPortal.GUI.Library.Action.ActionType.ACTION_CONTEXT_MENU: GUIPropertyManager.SetProperty("#keypressed", "Info"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_F1, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_F1, 0); + Log.Debug("Info"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_F1, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_F1, 0); break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREV_ITEM: GUIPropertyManager.SetProperty("#keypressed", "Replay"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_F2, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_F2, 0); + Log.Debug("Replay"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_F2, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_F2, 0); break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_UP: GUIPropertyManager.SetProperty("#keypressed", "Channel Up"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD8, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD8, 0); + Log.Debug("Channel Up"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD8, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD8, 0); break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_DOWN: GUIPropertyManager.SetProperty("#keypressed", "Channel Down"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD2, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD2, 0); + Log.Debug("Channel Down"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD2, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD2, 0); break; + case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM: + GUIPropertyManager.SetProperty("#keypressed", "OK"); + Log.Debug("OK"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_RETURN, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_RETURN, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT: + GUIPropertyManager.SetProperty("#keypressed", "LEFT"); + Log.Debug("LEFT"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_LEFT, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_LEFT, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT: + GUIPropertyManager.SetProperty("#keypressed", "RIGHT"); + Log.Debug("RIGHT"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_RIGHT, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_RIGHT, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_UP: + GUIPropertyManager.SetProperty("#keypressed", "UP"); + Log.Debug("UP"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_UP, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_UP, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_DOWN: + GUIPropertyManager.SetProperty("#keypressed", "DOWN"); + Log.Debug("DOWN"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_DOWN, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_DOWN, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_0: GUIPropertyManager.SetProperty("#keypressed", "0"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD0, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD0, 0); + Log.Debug("0"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD0, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD0, 0); break; case MediaPortal.GUI.Library.Action.ActionType.REMOTE_1: GUIPropertyManager.SetProperty("#keypressed", "1"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD1, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD1, 0); + Log.Debug("1"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD1, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD1, 0); break; case MediaPortal.GUI.Library.Action.ActionType.REMOTE_2: GUIPropertyManager.SetProperty("#keypressed", "2"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD2, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD2, 0); + Log.Debug("2"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD2, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD2, 0); break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_3: + GUIPropertyManager.SetProperty("#keypressed", "3"); + Log.Debug("3"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD3, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD3, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_4: + GUIPropertyManager.SetProperty("#keypressed", "4"); + Log.Debug("4"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD4, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD4, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_5: + GUIPropertyManager.SetProperty("#keypressed", "5"); + Log.Debug("5"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD5, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD5, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_6: + GUIPropertyManager.SetProperty("#keypressed", "6"); + Log.Debug("6"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD6, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD6, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_7: + GUIPropertyManager.SetProperty("#keypressed", "7"); + Log.Debug("7"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD7, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD7, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_8: + GUIPropertyManager.SetProperty("#keypressed", "8"); + Log.Debug("8"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD8, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD8, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_9: + GUIPropertyManager.SetProperty("#keypressed", "9"); + Log.Debug("9"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD9, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD9, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.ACTION_REWIND: + GUIPropertyManager.SetProperty("#keypressed", "REWIND"); + Log.Debug("REWIND"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_BACK, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_BACK, 0); + break; } } base.OnAction(action); Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -13,8 +13,8 @@ [assembly: AssemblyTitle("Opera Mobile Emulator Launcher for MediaPortal")] [assembly: AssemblyDescription("Starts Opera Mobile Emulator from within MediaPortal")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("For MediaPortal")] -[assembly: AssemblyProduct("Opera Mobile MediaPortal shortcut")] +[assembly: AssemblyCompany("for MediaPortal")] +[assembly: AssemblyProduct("Opera Mobile Launcher")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.dll =================================================================== (Binary files differ) Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 2012-05-25 10:30:51 UTC (rev 4490) @@ -24,949 +24,1348 @@ <ZipFileName>Installer{CopyFile}\{f8473215-d188-4f04-a914-1a6f3e094b6f}-OperaMobileLauncher.xml</ZipFileName> <DestinationFilename>%Config%\skin\StreamedMP\OperaMobileLauncher.xml</DestinationFilename> </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\ProgramData\Team MediaPortal\MediaPortal\skin\DefaultWide\OperaMobile.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{0f257152-b180-4088-b597-6487196c4cde}-OperaMobile.xml</ZipFileName> + <DestinationFilename>%Config%\skin\DefaultWide\OperaMobile.xml</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\ProgramData\Team MediaPortal\MediaPortal\skin\DefaultWide\OperaMobile.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{e97b6954-6e0e-43a3-a397-dc42b0b6282c}-OperaMobile.xml</ZipFileName> + <DestinationFilename>%Config%\skin\Default\OperaMobile.xml</DestinationFilename> + </FileItem> </Items> </Files> </GroupItem> - <GroupItem Name="Opera Mobile Emulator"> + <GroupItem Name="StreamedMP plugin background"> <ParentGroup /> - <DisplayName>Opera Mobile Emulator</DisplayName> + <DisplayName>StreamedMP plugin hover background</DisplayName> + <DefaulChecked>false</DefaulChecked> + <Description>StreamedMP plugin hover background</Description> + <Files> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>NeverOverwrite</UpdateOption> + <LocalFileName>hover_Opera Mobile Launcher.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{7bb57dd0-7731-4993-94f7-ecba6aa1acfc}-hover_Opera Mobile Launcher.png</ZipFileName> + <DestinationFilename>%Skin%\StreamedMP\Media\hover_Opera Mobile Launcher.png</DestinationFilename> + </FileItem> + </Items> + </Files> + </GroupItem> + <GroupItem Name="Opera Mobile Emulator 12"> + <ParentGroup /> + <DisplayName>Opera Mobile Emulator 12</DisplayName> <DefaulChecked>true</DefaulChecked> - <Description>Installs the Opera Mobile Emulator application on your computer. It will install in the Program Files Directory</Description> + <Description>Installs the Opera Mobile 12 Emulator application on your computer. It will install in the Program Files Directory</Description> <Files> <Items> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> - <UpdateOption>NeverOverwrite</UpdateOption> + <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\crashreporter.exe</LocalFileName> - <ZipFileName>Installer{CopyFile}\{b4cdca54-aa81-4ae7-aade-f1f606b25289}-crashreporter.exe</ZipFileName> + <ZipFileName>Installer{CopyFile}\{0f2e4eca-c25d-43ac-b62d-bce349f5bca0}-crashreporter.exe</ZipFileName> <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\crashreporter.exe</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> - <UpdateOption>NeverOverwrite</UpdateOption> - <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\crc.bin</LocalFileName> - <ZipFileName>Installer{CopyFile}\{2374a4c3-ca96-4545-8380-a44c35cb9eb5}-crc.bin</ZipFileName> - <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\crc.bin</DestinationFilename> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\Launcher.exe</LocalFileName> + <ZipFileName>Installer{CopyFile}\{bd293798-9508-4f01-afe0-519fb0db50bc}-Launcher.exe</ZipFileName> + <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\Launcher.exe</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> - <UpdateOption>NeverOverwrite</UpdateOption> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\LauncherDefault.ini</LocalFileName> + <ZipFileName>Installer{CopyFile}\{91925f65-b12f-4cba-b79c-affa12db8a8c}-LauncherDefault.ini</ZipFileName> + <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\LauncherDefault.ini</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\Program Files (x86)\Opera Mobile E... [truncated message content] |